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/OTP-PUB-KEY.set.asn | |
| 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/OTP-PUB-KEY.set.asn')
| -rw-r--r-- | lib/public_key/asn1/OTP-PUB-KEY.set.asn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/public_key/asn1/OTP-PUB-KEY.set.asn b/lib/public_key/asn1/OTP-PUB-KEY.set.asn index b3f3ccdb77..7ab1684ff3 100644 --- a/lib/public_key/asn1/OTP-PUB-KEY.set.asn +++ b/lib/public_key/asn1/OTP-PUB-KEY.set.asn @@ -10,3 +10,5 @@ ECPrivateKey.asn1 PKCS-7.asn1 PKCS-10.asn1 RFC5639.asn1 +CMSAesRsaesOaep.asn1 + |