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/doc/src/public_key_app.xml | |
| 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/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> - |