From 21f07ba4f63c9e2df74f23b17088cd32de5c50f6 Mon Sep 17 00:00:00 2001
From: Hans Nilsson
Date: Mon, 1 Oct 2018 12:22:01 +0200
Subject: crypto: Update RSA options to match specs and different OpenSSL
versions - Put rsa_pkcs1_oaep_padding in supports/0 - #ifdef updates -
Refine PKCS1_OAEP defines
---
lib/crypto/doc/src/algorithm_details.xml | 92 +++++++++++++++++++++++---------
1 file changed, 68 insertions(+), 24 deletions(-)
(limited to 'lib/crypto/doc')
diff --git a/lib/crypto/doc/src/algorithm_details.xml b/lib/crypto/doc/src/algorithm_details.xml
index 68ad264df7..4d58d26970 100644
--- a/lib/crypto/doc/src/algorithm_details.xml
+++ b/lib/crypto/doc/src/algorithm_details.xml
@@ -63,9 +63,9 @@
aes_ige256 | 16 | 32 | 16 |
blowfish_cbc | 4-56 | 8 | 8 |
- blowfish_cfb64 | 1- | 8 | any |
- blowfish_ecb | 1- | | 8 |
- blowfish_ofb64 | 1- | 8 | any |
+ blowfish_cfb64 | ≥1 | 8 | any |
+ blowfish_ecb | ≥1 | | 8 |
+ blowfish_ofb64 | ≥1 | 8 | any |
des3_cbc (=DES EDE3 CBC) | [8,8,8] | 8 | 8 |
des3_cfb (=DES EDE3 CFB) | [8,8,8] | 8 | any |
@@ -74,7 +74,7 @@
des_cfb | 8 | 8 | any |
des_ecb | 8 | | 8 |
des_ede3 (=DES EDE3 CBC) | [8,8,8] | 8 | 8 |
- rc2_cbc | 1- | 8 | 8 |
+ rc2_cbc | ≥1 | 8 | 8 |
Block cipher key lengths
@@ -90,9 +90,9 @@
Cipher and Mode | Key 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 | any | 1.1.0 - |
- aes_gcm | 16,24,32 | 1- | any | 1-16 default: 16 | any | 1.1.0 - |
- chacha20_poly1305 | 32 | 1-16 | any | 16 | any | 1.1.0 - |
+ aes_ccm | 16,24,32 | 7-13 | any | even 4-16 default: 12 | any | ≥1.1.0 |
+ aes_gcm | 16,24,32 | ≥1 | any | 1-16 default: 16 | any | ≥1.1.0 |
+ chacha20_poly1305 | 32 | 1-16 | any | 16 | any | ≥1.1.0 |
AEAD cipher key lengths
@@ -108,8 +108,8 @@
Cipher and Mode | Key length [bytes] | IV length [bytes] | Supported with OpenSSL versions |
- aes_ctr | 16, 24, 32 | 16 | 1.0.1 - |
- rc4 | 1- | | all |
+ aes_ctr | 16, 24, 32 | 16 | ≥1.0.1 |
+ rc4 | ≥1 | | all |
Stream cipher key lengths
@@ -141,9 +141,9 @@
aes_cfb8 | 16 | 1 |
blowfish_cbc | 4-56 | 8 |
- blowfish_cfb64 | 1- | 1 |
- blowfish_ecb | 1- | 8 |
- blowfish_ofb64 | 1- | 1 |
+ blowfish_cfb64 | ≥1 | 1 |
+ blowfish_ecb | ≥1 | 8 |
+ blowfish_ofb64 | ≥1 | 1 |
des3_cbc (=DES EDE3 CBC) | [8,8,8] | 8 |
des3_cfb (=DES EDE3 CFB) | [8,8,8] | 1 |
@@ -152,7 +152,7 @@
des_cfb | 8 | 1 |
des_ecb | 8 | 1 |
- rc2_cbc | 1- | 8 |
+ rc2_cbc | ≥1 | 8 |
CMAC cipher key lengths
@@ -195,7 +195,7 @@
SHA1 | sha | all |
SHA2 | sha224, sha256, sha384, sha512 | all |
- SHA3 | sha3_224, sha3_256, sha3_384, sha3_512 | 1.1.1 - |
+ SHA3 | sha3_224, sha3_256, sha3_384, sha3_512 | ≥1.1.1 |
MD4 | md4 | all |
MD5 | md5 | all |
RIPEMD | ripemd160 | all |
@@ -221,18 +221,62 @@
without prior notice.
- Option | sign/verify | encrypt/decrypt | Supported with OpenSSL versions |
- {rsa_mgf1_md,atom()} | x | x | 1.0.1 |
- {rsa_oaep_label, binary()} | | x | |
- {rsa_oaep_md, atom()} | | x | |
- {rsa_padding,rsa_pkcs1_pss_padding} | x | | 1.0.0 |
- {rsa_pss_saltlen, -2..} | x | | 1.0.0 |
- {rsa_padding,rsa_no_padding} | x | x | |
- {rsa_padding,rsa_pkcs1_padding} | x | x | |
- {rsa_padding,rsa_sslv23_padding} | | x | |
- {rsa_padding,rsa_x931_padding} | x | | |
+ Option |
+ sign/verify |
+ public encrypt private decrypt |
+ private encrypt public decrypt |
+
+ {rsa_padding,rsa_x931_padding} |
+ x |
+ |
+ x |
+
+ {rsa_padding,rsa_pkcs1_padding} |
+ x |
+ x |
+ x |
+
+ {rsa_padding,rsa_pkcs1_pss_padding}
+ {rsa_pss_saltlen, -2..}
+ {rsa_mgf1_md, atom()}
+ |
+ x (2)
+ x (2)
+ x (2) |
+ |
+ |
+
+ {rsa_padding,rsa_pkcs1_oaep_padding}
+ {rsa_mgf1_md, atom()}
+ {rsa_oaep_label, binary()}}
+ {rsa_oaep_md, atom()}
+ |
+ |
+ x (2)
+ x (2)
+ x (3)
+ x (3)
+ |
+ |
+
+ {rsa_padding,rsa_no_padding} |
+ x (1) |
+ |
+ |
+
+
+ Notes:
+
+ - (1) OpenSSL ≤ 1.0.0
+ - (2) OpenSSL ≥ 1.0.1
+ - (3) OpenSSL ≥ 1.1.0
+