diff options
| -rw-r--r-- | CHANGES.md | 7 | ||||
| -rw-r--r-- | NEWS.md | 3 | ||||
| -rw-r--r-- | apps/cms.c | 11 | ||||
| -rw-r--r-- | apps/req.c | 4 | ||||
| -rw-r--r-- | apps/smime.c | 10 | ||||
| -rw-r--r-- | doc/man1/openssl-cms.pod.in | 10 | ||||
| -rw-r--r-- | doc/man1/openssl-req.pod.in | 5 | ||||
| -rw-r--r-- | doc/man1/openssl-smime.pod.in | 14 |
8 files changed, 31 insertions, 33 deletions
diff --git a/CHANGES.md b/CHANGES.md index 91a58ff558..53d0208ca8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -30,6 +30,13 @@ OpenSSL 3.4 ### Changes between 3.4 and 3.5 [xx XXX xxxx] + * Updated the default encryption cipher for the `req`, `cms`, and `smime` applications + from `des-ede3-cbc` to `aes-256-cbc`. + + AES-256 provides a stronger 256-bit key encryption than legacy 3DES. + + *Aditya* + * Enhanced PKCS#7 inner contents verification. In the PKCS7_verify() function, the BIO *indata parameter refers to the signed data if the content is detached from p7. Otherwise, indata should be @@ -33,7 +33,8 @@ This release is in development. This release incorporates the following potentially significant or incompatible changes: - * none yet + * Default encryption cipher for the `req`, `cms`, and `smime` applications + changed from `des-ede3-cbc` to `aes-256-cbc`. This release adds the following new features: diff --git a/apps/cms.c b/apps/cms.c index c225f07ac0..d280b25d43 100644 --- a/apps/cms.c +++ b/apps/cms.c @@ -822,15 +822,8 @@ int cms_main(int argc, char **argv) } if (operation == SMIME_ENCRYPT) { - if (!cipher) { -#ifndef OPENSSL_NO_DES - cipher = (EVP_CIPHER *)EVP_des_ede3_cbc(); -#else - BIO_printf(bio_err, "No cipher selected\n"); - goto end; -#endif - } - + if (!cipher) + cipher = (EVP_CIPHER *)EVP_aes_256_cbc(); if (secret_key && !secret_keyid) { BIO_printf(bio_err, "No secret key id\n"); goto end; diff --git a/apps/req.c b/apps/req.c index 37800b318d..c5627ffda5 100644 --- a/apps/req.c +++ b/apps/req.c @@ -275,9 +275,7 @@ int req_main(int argc, char **argv) long newkey_len = -1; unsigned long chtype = MBSTRING_ASC, reqflag = 0; -#ifndef OPENSSL_NO_DES - cipher = (EVP_CIPHER *)EVP_des_ede3_cbc(); -#endif + cipher = (EVP_CIPHER *)EVP_aes_256_cbc(); opt_set_unknown_name("digest"); prog = opt_init(argc, argv, req_options); diff --git a/apps/smime.c b/apps/smime.c index d5a4feb489..132caba2ef 100644 --- a/apps/smime.c +++ b/apps/smime.c @@ -471,14 +471,8 @@ int smime_main(int argc, char **argv) } if (operation == SMIME_ENCRYPT) { - if (cipher == NULL) { -#ifndef OPENSSL_NO_DES - cipher = (EVP_CIPHER *)EVP_des_ede3_cbc(); -#else - BIO_printf(bio_err, "No cipher selected\n"); - goto end; -#endif - } + if (cipher == NULL) + cipher = (EVP_CIPHER *)EVP_aes_256_cbc(); encerts = sk_X509_new_null(); if (encerts == NULL) goto end; diff --git a/doc/man1/openssl-cms.pod.in b/doc/man1/openssl-cms.pod.in index da819a047b..f6b3a4c7d6 100644 --- a/doc/man1/openssl-cms.pod.in +++ b/doc/man1/openssl-cms.pod.in @@ -406,16 +406,16 @@ One or more certificate filenames may be given. =item B<-I<cipher>> -The encryption algorithm to use. For example triple DES (168 bits) - B<-des3> -or 256 bit AES - B<-aes256>. Any standard algorithm name (as used by the +The encryption algorithm to use. For example, AES (256 bits) - B<-aes256> +or triple DES (168 bits) - B<-des3>. Any standard algorithm name (as used by the EVP_get_cipherbyname() function) can also be used preceded by a dash, for example B<-aes-128-cbc>. See L<openssl-enc(1)> for a list of ciphers supported by your version of OpenSSL. -Currently the AES variants with GCM mode are the only supported AEAD +Currently, the AES variants with GCM mode are the only supported AEAD algorithms. -If not specified triple DES is used. Only used with B<-encrypt> and +If not specified, AES-256-CBC is used as the default. Only used with B<-encrypt> and B<-EncryptedData_create> commands. =item B<-wrap> I<cipher> @@ -896,6 +896,8 @@ L<ossl_store-file(7)> =head1 HISTORY +The default encryption cipher was changed from 3DES to AES-256 in OpenSSL 3.5. + The use of multiple B<-signer> options and the B<-resign> command were first added in OpenSSL 1.0.0. diff --git a/doc/man1/openssl-req.pod.in b/doc/man1/openssl-req.pod.in index 5cb3004d3f..f49730e454 100644 --- a/doc/man1/openssl-req.pod.in +++ b/doc/man1/openssl-req.pod.in @@ -90,8 +90,7 @@ The data is a PKCS#10 object. =item B<-cipher> I<name> Specify the cipher to be used for encrypting the private key. -The default cipher is 3DES (DES-EDE3-CBC). -If no cipher is specified, 3DES will be used by default. +If no cipher is specified, AES-256-CBC will be used by default. You can override this by providing any valid OpenSSL cipher name. =item B<-in> I<filename> @@ -836,6 +835,8 @@ L<x509v3_config(5)> =head1 HISTORY +The default encryption cipher was changed from 3DES to AES-256 in OpenSSL 3.5. + The B<-section> option was added in OpenSSL 3.0.0. The B<-multivalue-rdn> option has become obsolete in OpenSSL 3.0.0 and diff --git a/doc/man1/openssl-smime.pod.in b/doc/man1/openssl-smime.pod.in index 330ddf2f87..845fb74e31 100644 --- a/doc/man1/openssl-smime.pod.in +++ b/doc/man1/openssl-smime.pod.in @@ -167,13 +167,13 @@ default digest algorithm for the signing key will be used (usually SHA1). =item B<-I<cipher>> -The encryption algorithm to use. For example DES (56 bits) - B<-des>, -triple DES (168 bits) - B<-des3>, -EVP_get_cipherbyname() function) can also be used preceded by a dash, for -example B<-aes-128-cbc>. See L<openssl-enc(1)> for list of ciphers -supported by your version of OpenSSL. +The encryption algorithm to use. For example, DES (56 bits) - B<-des>, +triple DES (168 bits) - B<-des3>, or AES (256 bits) - B<-aes256>. +Any standard algorithm name (as used by the EVP_get_cipherbyname() function) +can also be used, preceded by a dash, for example B<-aes-128-cbc>. +See L<openssl-enc(1)> for a list of ciphers supported by your version of OpenSSL. -If not specified triple DES is used. Only used with B<-encrypt>. +If not specified, AES-256-CBC is used as the default. Only used with B<-encrypt>. =item B<-nointern> @@ -468,6 +468,8 @@ L<ossl_store-file(7)> =head1 HISTORY +The default encryption cipher was changed from 3DES to AES-256 in OpenSSL 3.5. + The use of multiple B<-signer> options and the B<-resign> command were first added in OpenSSL 1.0.0 |