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/doc/src/public_key_app.xml | |
| 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/doc/src/public_key_app.xml')
| -rw-r--r-- | lib/public_key/doc/src/public_key_app.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/public_key/doc/src/public_key_app.xml b/lib/public_key/doc/src/public_key_app.xml index 923a9f1dfb..5f2c50711a 100644 --- a/lib/public_key/doc/src/public_key_app.xml +++ b/lib/public_key/doc/src/public_key_app.xml @@ -51,6 +51,9 @@ Diffie-Hellman Key Agreement Standard </item> <item>Supports <url href="http://www.ietf.org/rfc/rfc2898.txt"> PKCS-5</url> - Password-Based Cryptography Standard </item> + <item>Supports <url href="http://www.ietf.org/rfc/fc3565.txt"> AES </url> - + Use of the Advanced Encryption Standard (AES) Algorithm in Cryptographic Message Syntax (CMS) + </item> <item>Supports <url href="http://www.ietf.org/rfc/rfc5208.txt"> PKCS-8</url> - Private-Key Information Syntax Standard</item> <item>Supports <url href="http://www.ietf.org/rfc/rfc5967.txt"> PKCS-10</url> - |