[openssl] master update
The branch master has been updated via d15506874bff1b128b36ceb847d24ac4b8cd4958 (commit) from cce935b23ce2f7942e2ef4368dd93b60e21d3d83 (commit) - Log - commit d15506874bff1b128b36ceb847d24ac4b8cd4958 Author: Dmitry Belyavskiy Date: Fri Aug 27 18:03:15 2021 +0200 Adjust the list of default provider's algorithms Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/16448) --- Summary of changes: doc/man7/OSSL_PROVIDER-default.pod | 14 +- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/doc/man7/OSSL_PROVIDER-default.pod b/doc/man7/OSSL_PROVIDER-default.pod index 88ae3fec9d..14d590cbde 100644 --- a/doc/man7/OSSL_PROVIDER-default.pod +++ b/doc/man7/OSSL_PROVIDER-default.pod @@ -81,24 +81,12 @@ The OpenSSL default provider supports these operations and algorithms: =item CAMELLIA, see L -=item DES, see L - -=item BF, see L - -=item IDEA, see L - -=item CAST5, see L +=item 3DES, see L =item SEED, see L =item SM4, see L -=item RC2, see L - -=item RC4, see L - -=item RC5, see L - =item ChaCha20, see L =item ChaCha20-Poly1305, see L
[openssl] OpenSSL_1_1_1-stable update
The branch OpenSSL_1_1_1-stable has been updated
via dc3520b1ad3e1d70b899210bacc002318ebe276a (commit)
from 876b7e97b848ba179c1dbe4a4a265dfffae0eba6 (commit)
- Log -
commit dc3520b1ad3e1d70b899210bacc002318ebe276a
Author: Bernd Edlinger
Date: Fri Aug 27 13:11:39 2021 +0200
Fix the "Out of memory" EVP KDF scrypt test
This test did not really execute, since usually
the OPENSSL_malloc(0) will fail and prevent the
execution of the KDF.
Reviewed-by: Paul Dale
(Merged from https://github.com/openssl/openssl/pull/16446)
---
Summary of changes:
test/evp_test.c | 2 +-
test/recipes/30-test_evp_data/evpkdf.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/test/evp_test.c b/test/evp_test.c
index abb51384e8..d4cca6dbcb 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -1777,7 +1777,7 @@ static int kdf_test_run(EVP_TEST *t)
unsigned char *got = NULL;
size_t got_len = expected->output_len;
-if (!TEST_ptr(got = OPENSSL_malloc(got_len))) {
+if (!TEST_ptr(got = OPENSSL_malloc(got_len == 0 ? 1 : got_len))) {
t->err = "INTERNAL_ERROR";
goto err;
}
diff --git a/test/recipes/30-test_evp_data/evpkdf.txt
b/test/recipes/30-test_evp_data/evpkdf.txt
index 9a6cc28385..8fe0df3972 100644
--- a/test/recipes/30-test_evp_data/evpkdf.txt
+++ b/test/recipes/30-test_evp_data/evpkdf.txt
@@ -301,5 +301,5 @@ Ctrl.salt = salt:SodiumChloride
Ctrl.N = N:1048576
Ctrl.r = r:8
Ctrl.p = p:1
-Result = INTERNAL_ERROR
+Result = KDF_MISMATCH
[openssl] master update
The branch master has been updated
via cce935b23ce2f7942e2ef4368dd93b60e21d3d83 (commit)
from 20b39175b59b5ae83223bbb9f743c73ae822d681 (commit)
- Log -
commit cce935b23ce2f7942e2ef4368dd93b60e21d3d83
Author: Bernd Edlinger
Date: Fri Aug 27 13:11:39 2021 +0200
Fix the "Out of memory" EVP KDF scrypt test
This test did not really execute, since usually
the OPENSSL_malloc(0) will fail and prevent the
execution of the KDF.
Reviewed-by: Tomas Mraz
Reviewed-by: Paul Dale
(Merged from https://github.com/openssl/openssl/pull/16444)
---
Summary of changes:
test/evp_test.c | 4 ++--
test/recipes/30-test_evp_data/evpkdf_scrypt.txt | 2 +-
test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/test/evp_test.c b/test/evp_test.c
index 0009cae442..075abc5ad9 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -2664,7 +2664,7 @@ static int kdf_test_run(EVP_TEST *t)
t->err = "KDF_CTRL_ERROR";
return 1;
}
-if (!TEST_ptr(got = OPENSSL_malloc(got_len))) {
+if (!TEST_ptr(got = OPENSSL_malloc(got_len == 0 ? 1 : got_len))) {
t->err = "INTERNAL_ERROR";
goto err;
}
@@ -2760,7 +2760,7 @@ static int pkey_kdf_test_run(EVP_TEST *t)
unsigned char *got = NULL;
size_t got_len = expected->output_len;
-if (!TEST_ptr(got = OPENSSL_malloc(got_len))) {
+if (!TEST_ptr(got = OPENSSL_malloc(got_len == 0 ? 1 : got_len))) {
t->err = "INTERNAL_ERROR";
goto err;
}
diff --git a/test/recipes/30-test_evp_data/evpkdf_scrypt.txt
b/test/recipes/30-test_evp_data/evpkdf_scrypt.txt
index 7aba716246..64176091fc 100644
--- a/test/recipes/30-test_evp_data/evpkdf_scrypt.txt
+++ b/test/recipes/30-test_evp_data/evpkdf_scrypt.txt
@@ -60,4 +60,4 @@ Ctrl.salt = salt:SodiumChloride
Ctrl.N = n:1048576
Ctrl.r = r:8
Ctrl.p = p:1
-Result = INTERNAL_ERROR
+Result = KDF_MISMATCH
diff --git a/test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt
b/test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt
index 086451a44c..1f7c06c6d4 100644
--- a/test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt
+++ b/test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt
@@ -60,4 +60,4 @@ Ctrl.salt = salt:SodiumChloride
Ctrl.N = N:1048576
Ctrl.r = r:8
Ctrl.p = p:1
-Result = INTERNAL_ERROR
+Result = KDF_MISMATCH
[openssl] master update
The branch master has been updated via 20b39175b59b5ae83223bbb9f743c73ae822d681 (commit) from 5327da81f0c70e35bdd8860af9af351313ca4ae2 (commit) - Log - commit 20b39175b59b5ae83223bbb9f743c73ae822d681 Author: Rich Salz Date: Thu Aug 26 16:03:15 2021 -0400 Yet another doc-nits fix Reviewed-by: Richard Levitte Reviewed-by: Paul Dale Reviewed-by: Dmitry Belyavskiy (Merged from https://github.com/openssl/openssl/pull/16436) --- Summary of changes: doc/man1/openssl-req.pod.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/man1/openssl-req.pod.in b/doc/man1/openssl-req.pod.in index 9926901571..e78b04c65b 100644 --- a/doc/man1/openssl-req.pod.in +++ b/doc/man1/openssl-req.pod.in @@ -401,8 +401,7 @@ The options available are described in detail below. =over 4 -=item B -=item B +=item B, B The passwords for the input private key file (if present) and the output private key file (if one will be created). The
Coverity Scan: Analysis completed for OpenSSL-1.0.2
Your request for analysis of OpenSSL-1.0.2 has been completed successfully. The results are available at https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50yoN-2BQSVjTtaSz8wS4wOr7Hlun-2FGpeF2rhqKLKnzox0Gkw-3D-3DC4pq_MulOTlHne1IxTRELXXnGni8d68xSVF-2BUCe3a7Ux-2BjeGlaE244uFVxusbb36c6-2FD9Azng4wP6l2mYCFO6g9f6Hbup-2BsZztOy3ozTNYjjygtgeNf7JJmulRbzclkR0NNYIt-2FVDlCvFcaL0Ccnq-2FJNw6Irilo1NqnAThfHgZTI-2FqgHG2C7mqKitQfgO4w7moQDBqhpF-2BB94NPgxhNDk7f-2FfChM9smfiyvOFBCSanxOFzTU-3D Build ID: 404633 Analysis Summary: New defects found: 0 Defects eliminated: 0
Coverity Scan: Analysis completed for openssl/openssl
Your request for analysis of openssl/openssl has been completed successfully. The results are available at https://u15810271.ct.sendgrid.net/ls/click?upn=HRESupC-2F2Czv4BOaCWWCy7my0P0qcxCbhZ31OYv50yoN-2BQSVjTtaSz8wS4wOr7HlekBtV1P4YRtWclMVkCdvAA-3D-3DpZvS_MulOTlHne1IxTRELXXnGni8d68xSVF-2BUCe3a7Ux-2BjeFP9ueB6lSO4tGU1yxYpTB5EZV2ogrqk2D-2BM-2FQOluNeEQ8XZSSNWQ71fPawDVWxPjJBQygpLn0XIYwFP62zOi624zX-2B4lUNb1I8gxUieg3IG7VukTKsTfXF5bM7mY4bhTYrIrSrUpTtPNuLxHhTxbDpS9RCupgr4FuEbUU2lC4ZwerjtAtqiHRraJNR3Lunyv0-3D Build ID: 404632 Analysis Summary: New defects found: 0 Defects eliminated: 0
