From f850f6bdf6a13ef91f6f97ce821968ff977ff4d7 Mon Sep 17 00:00:00 2001 From: Hans Nilsson Date: Thu, 13 Sep 2018 12:45:48 +0200 Subject: crypto: Document AES_CCM and fix errors in User's Guide The sizes in the Algorithms chapter for aes_gcm was wrong or incomplete. --- lib/crypto/doc/src/algorithm_details.xml | 7 ++++--- lib/crypto/doc/src/crypto.xml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/crypto/doc/src') diff --git a/lib/crypto/doc/src/algorithm_details.xml b/lib/crypto/doc/src/algorithm_details.xml index 088f5e8e97..2d02422cb6 100644 --- a/lib/crypto/doc/src/algorithm_details.xml +++ b/lib/crypto/doc/src/algorithm_details.xml @@ -89,9 +89,10 @@ crypto:supports().

- Cipher and ModeKey length
[bytes]IV length
[bytes]AAD length
[bytes]Block size
[bytes]Supported with
OpenSSL versions - aes_gcm 16 16 0-16 any1.0.1 - - chacha20_poly130532 1-16 any any1.1.0 - + Cipher and ModeKey length
[bytes]IV length
[bytes]AAD length
[bytes]Tag length
[bytes]Block size
[bytes]Supported with
OpenSSL versions + aes_ccm 16,24,32 7-13 any even 4-16
default: 12 any1.1.0 - + aes_gcm 16,24,32 1- any 1-16
default: 16 any1.1.0 - + chacha20_poly130532 1-16 any 16 any1.1.0 -AEAD cipher key lengths
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index d5f5009297..214104c74a 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -420,7 +420,7 @@ block_encrypt(Type, Key, Ivec, PlainText) -> CipherText block_encrypt(AeadType, Key, Ivec, {AAD, PlainText}) -> {CipherText, CipherTag} - block_encrypt(aes_gcm, Key, Ivec, {AAD, PlainText, TagLength}) -> {CipherText, CipherTag} + block_encrypt(aes_gcm | aes_ccm, Key, Ivec, {AAD, PlainText, TagLength}) -> {CipherText, CipherTag} Encrypt PlainText according to Type block cipher Type = block_cipher_with_iv() -- cgit v1.2.3