diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-06-11 09:43:08 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-06-11 09:43:08 +0200 |
| commit | 7742555c6f88133c60639e5db464d90495bb943a (patch) | |
| tree | 5c87b3923f0a2a90a4215273658eaa373eff0423 /lib/public_key/asn1/Makefile | |
| parent | 50c9a2e0f0668bcdc0d2779d450d28bdd8c8926c (diff) | |
| parent | 20d0c9200862d5e725100b5b1bc26efb28a37a7d (diff) | |
| download | otp-7742555c6f88133c60639e5db464d90495bb943a.tar.gz otp-7742555c6f88133c60639e5db464d90495bb943a.tar.bz2 otp-7742555c6f88133c60639e5db464d90495bb943a.zip | |
Merge branch 'ingela/public_key/PEBS2-AES/ERL-952/OTP-15870' into maint
* ingela/public_key/PEBS2-AES/ERL-952/OTP-15870:
public_key: Add AES to PBE2
Diffstat (limited to 'lib/public_key/asn1/Makefile')
| -rw-r--r-- | lib/public_key/asn1/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile index a920ea87ea..10952106c6 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -42,7 +42,7 @@ RELSYSDIR = $(RELEASE_PATH)/lib/public_key-$(VSN) ASN_TOP = OTP-PUB-KEY PKCS-FRAME ASN_MODULES = PKIX1Explicit88 PKIX1Implicit88 PKIX1Algorithms88 \ PKIXAttributeCertificate PKCS-1 PKCS-3 PKCS-7 PKCS-8 PKCS-10 PKCS5v2-0 OTP-PKIX \ - InformationFramework RFC5639 + InformationFramework RFC5639 CMSAesRsaesOaep ASN_ASNS = $(ASN_MODULES:%=%.asn1) ASN_ERLS = $(ASN_TOP:%=%.erl) ASN_HRLS = $(ASN_TOP:%=%.hrl) |