diff options
| author | Erlang/OTP <[email protected]> | 2019-06-17 16:50:20 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2019-06-17 16:50:20 +0200 |
| commit | 8ba6427bba42152a81f5bbb5a66dd3478db75f08 (patch) | |
| tree | 47547c55910223f8cae42c1da3aa5f7d66547499 /lib/public_key/asn1/Makefile | |
| parent | 66ae1e444e2442bfa57e01d8c7b4005a8d69eb4e (diff) | |
| parent | 1a58ece4788ce6ff89827019d085f62a47d9726d (diff) | |
| download | otp-8ba6427bba42152a81f5bbb5a66dd3478db75f08.tar.gz otp-8ba6427bba42152a81f5bbb5a66dd3478db75f08.tar.bz2 otp-8ba6427bba42152a81f5bbb5a66dd3478db75f08.zip | |
Merge branch 'ingela/public_key/PEBS2-backport/OTP-15870' into maint-21
* ingela/public_key/PEBS2-backport/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) |