[openssl] openssl-3.0 update
The branch openssl-3.0 has been updated
via f2f2ac88499ad58546f9c5b19ebc0b6eddf0b49f (commit)
from 4ed2db591a42fb99401f9b0ff17f6644797ae743 (commit)
- Log -
commit f2f2ac88499ad58546f9c5b19ebc0b6eddf0b49f
Author: Dr. David von Oheimb
Date: Tue Dec 7 11:35:42 2021 +0100
APPS/cmp: fix -rspin option such that it works again without -reqin
Reviewed-by: Tomas Mraz
(Merged from https://github.com/openssl/openssl/pull/17222)
(cherry picked from commit 7ee0954a086ee3b4e0a8c6736600e3d6362485c0)
---
Summary of changes:
apps/cmp.c | 3 ++-
test/recipes/80-test_cmp_http_data/test_commands.csv | 4
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/apps/cmp.c b/apps/cmp.c
index 119419c5ef..d0f127d3ea 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -753,6 +753,7 @@ static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx,
OSSL_CMP_MSG *req_new = NULL;
OSSL_CMP_MSG *res = NULL;
OSSL_CMP_PKIHEADER *hdr;
+const char *prev_opt_rspin = opt_rspin;
if (req != NULL && opt_reqout != NULL
&& !write_PKIMESSAGE(req, _reqout))
@@ -782,7 +783,7 @@ static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx,
if (res == NULL)
goto err;
-if (opt_reqin != NULL || opt_rspin != NULL) {
+if (opt_reqin != NULL || prev_opt_rspin != NULL) {
/* need to satisfy nonce and transactionID checks */
ASN1_OCTET_STRING *nonce;
ASN1_OCTET_STRING *tid;
diff --git a/test/recipes/80-test_cmp_http_data/test_commands.csv
b/test/recipes/80-test_cmp_http_data/test_commands.csv
index 0bfa6c..7395b42791 100644
--- a/test/recipes/80-test_cmp_http_data/test_commands.csv
+++ b/test/recipes/80-test_cmp_http_data/test_commands.csv
@@ -53,3 +53,7 @@ expected,description, -section,val, -cmd,val,val2,
-cacertsout,val,val2, -infoty
0,geninfo bad syntax: missing ':', -section,, -cmd,cr,, -cert,signer.crt,
-key,signer.p12, -keypass,pass:12345,BLANK,, -geninfo,1.2.3:int987
0,geninfo bad syntax: double ':', -section,, -cmd,cr,, -cert,signer.crt,
-key,signer.p12, -keypass,pass:12345,BLANK,, -geninfo,1.2.3:int::987
0,geninfo bad syntax: missing ':int', -section,, -cmd,cr,, -cert,signer.crt,
-key,signer.p12, -keypass,pass:12345,BLANK,, -geninfo,1.2.3
+,,,
+1,reqout+rspout, -section,, -cmd,ir,,-reqout,_RESULT_DIR/req1.der
_RESULT_DIR/req2.der,,-rspout,_RESULT_DIR/rsp1.der
_RESULT_DIR/rsp2.der,,BLANK,,BLANK,
+1,reqin, -section,, -cmd,ir,,-reqin,_RESULT_DIR/req1.der
_RESULT_DIR/req2.der,,BLANK,,,BLANK,,BLANK,
+1,rspin, -section,, -cmd,ir,,BLANK,,,-rspin,_RESULT_DIR/rsp1.der
_RESULT_DIR/rsp2.der,,BLANK,,BLANK,
[openssl] master update
The branch master has been updated
via 7ee0954a086ee3b4e0a8c6736600e3d6362485c0 (commit)
from d580c2790f9f304533a3eda2a9cf6b8eb22830c3 (commit)
- Log -
commit 7ee0954a086ee3b4e0a8c6736600e3d6362485c0
Author: Dr. David von Oheimb
Date: Tue Dec 7 11:35:42 2021 +0100
APPS/cmp: fix -rspin option such that it works again without -reqin
Reviewed-by: Tomas Mraz
(Merged from https://github.com/openssl/openssl/pull/17222)
---
Summary of changes:
apps/cmp.c | 3 ++-
test/recipes/80-test_cmp_http_data/test_commands.csv | 4
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/apps/cmp.c b/apps/cmp.c
index 5056d841d1..3082d7d8f6 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -753,6 +753,7 @@ static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx,
OSSL_CMP_MSG *req_new = NULL;
OSSL_CMP_MSG *res = NULL;
OSSL_CMP_PKIHEADER *hdr;
+const char *prev_opt_rspin = opt_rspin;
if (req != NULL && opt_reqout != NULL
&& !write_PKIMESSAGE(req, _reqout))
@@ -782,7 +783,7 @@ static OSSL_CMP_MSG *read_write_req_resp(OSSL_CMP_CTX *ctx,
if (res == NULL)
goto err;
-if (opt_reqin != NULL || opt_rspin != NULL) {
+if (opt_reqin != NULL || prev_opt_rspin != NULL) {
/* need to satisfy nonce and transactionID checks */
ASN1_OCTET_STRING *nonce;
ASN1_OCTET_STRING *tid;
diff --git a/test/recipes/80-test_cmp_http_data/test_commands.csv
b/test/recipes/80-test_cmp_http_data/test_commands.csv
index 0bfa6c..7395b42791 100644
--- a/test/recipes/80-test_cmp_http_data/test_commands.csv
+++ b/test/recipes/80-test_cmp_http_data/test_commands.csv
@@ -53,3 +53,7 @@ expected,description, -section,val, -cmd,val,val2,
-cacertsout,val,val2, -infoty
0,geninfo bad syntax: missing ':', -section,, -cmd,cr,, -cert,signer.crt,
-key,signer.p12, -keypass,pass:12345,BLANK,, -geninfo,1.2.3:int987
0,geninfo bad syntax: double ':', -section,, -cmd,cr,, -cert,signer.crt,
-key,signer.p12, -keypass,pass:12345,BLANK,, -geninfo,1.2.3:int::987
0,geninfo bad syntax: missing ':int', -section,, -cmd,cr,, -cert,signer.crt,
-key,signer.p12, -keypass,pass:12345,BLANK,, -geninfo,1.2.3
+,,,
+1,reqout+rspout, -section,, -cmd,ir,,-reqout,_RESULT_DIR/req1.der
_RESULT_DIR/req2.der,,-rspout,_RESULT_DIR/rsp1.der
_RESULT_DIR/rsp2.der,,BLANK,,BLANK,
+1,reqin, -section,, -cmd,ir,,-reqin,_RESULT_DIR/req1.der
_RESULT_DIR/req2.der,,BLANK,,,BLANK,,BLANK,
+1,rspin, -section,, -cmd,ir,,BLANK,,,-rspin,_RESULT_DIR/rsp1.der
_RESULT_DIR/rsp2.der,,BLANK,,BLANK,
[openssl] openssl-3.0 update
The branch openssl-3.0 has been updated
via 4ed2db591a42fb99401f9b0ff17f6644797ae743 (commit)
from 35f45ae0078f9972a4ea887f59670a7e8f346f94 (commit)
- Log -
commit 4ed2db591a42fb99401f9b0ff17f6644797ae743
Author: Dr. David von Oheimb
Date: Tue Dec 7 17:49:05 2021 +0100
OSSL_CMP_MSG_read(): Fix mem leak on file read error
Reviewed-by: Paul Dale
Reviewed-by: Tomas Mraz
(Merged from https://github.com/openssl/openssl/pull/17225)
(cherry picked from commit d580c2790f9f304533a3eda2a9cf6b8eb22830c3)
---
Summary of changes:
crypto/cmp/cmp_msg.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/crypto/cmp/cmp_msg.c b/crypto/cmp/cmp_msg.c
index 10ef4cd922..84a272fe2b 100644
--- a/crypto/cmp/cmp_msg.c
+++ b/crypto/cmp/cmp_msg.c
@@ -1100,9 +1100,8 @@ OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file,
OSSL_LIB_CTX *libctx,
return NULL;
}
-if ((bio = BIO_new_file(file, "rb")) == NULL)
-return NULL;
-if (d2i_OSSL_CMP_MSG_bio(bio, ) == NULL) {
+if ((bio = BIO_new_file(file, "rb")) == NULL
+|| d2i_OSSL_CMP_MSG_bio(bio, ) == NULL) {
OSSL_CMP_MSG_free(msg);
msg = NULL;
}
[openssl] master update
The branch master has been updated
via d580c2790f9f304533a3eda2a9cf6b8eb22830c3 (commit)
from f5485b97b6c9977c0d39c7669b9f97a879312447 (commit)
- Log -
commit d580c2790f9f304533a3eda2a9cf6b8eb22830c3
Author: Dr. David von Oheimb
Date: Tue Dec 7 17:49:05 2021 +0100
OSSL_CMP_MSG_read(): Fix mem leak on file read error
Reviewed-by: Paul Dale
Reviewed-by: Tomas Mraz
(Merged from https://github.com/openssl/openssl/pull/17225)
---
Summary of changes:
crypto/cmp/cmp_msg.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/crypto/cmp/cmp_msg.c b/crypto/cmp/cmp_msg.c
index 51b0998bdc..0497155e09 100644
--- a/crypto/cmp/cmp_msg.c
+++ b/crypto/cmp/cmp_msg.c
@@ -1100,9 +1100,8 @@ OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file,
OSSL_LIB_CTX *libctx,
return NULL;
}
-if ((bio = BIO_new_file(file, "rb")) == NULL)
-return NULL;
-if (d2i_OSSL_CMP_MSG_bio(bio, ) == NULL) {
+if ((bio = BIO_new_file(file, "rb")) == NULL
+|| d2i_OSSL_CMP_MSG_bio(bio, ) == NULL) {
OSSL_CMP_MSG_free(msg);
msg = NULL;
}
[openssl] master update
The branch master has been updated
via f5485b97b6c9977c0d39c7669b9f97a879312447 (commit)
from f4f77c2d9756cee12875397276799a93f057d412 (commit)
- Log -
commit f5485b97b6c9977c0d39c7669b9f97a879312447
Author: pkubaj
Date: Sat Nov 20 20:40:06 2021 +
Add support for BSD-ppc, BSD-ppc64 and BSD-ppc64le configurations
OpenSSL assumes AT_HWCAP = 16 (as on Linux), but on FreeBSD AT_HWCAP = 25
Switch to using AT_HWCAP, and setting it to 16 if it is not defined.
CLA: trivial
Reviewed-by: Matt Caswell
Reviewed-by: Paul Dale
(Merged from https://github.com/openssl/openssl/pull/17090)
---
Summary of changes:
Configurations/10-main.conf | 25 +
Configure | 2 +-
crypto/ppccap.c | 12
util/perl/OpenSSL/config.pm | 5 +++--
4 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 9f8fb32a86..071b1e5abe 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1070,6 +1070,31 @@ my %targets = (
perlasm_scheme => "linux64",
},
+"BSD-ppc" => {
+inherit_from => [ "BSD-generic32" ],
+asm_arch => 'ppc32',
+perlasm_scheme => "linux32",
+lib_cppflags => add("-DB_ENDIAN"),
+},
+
+"BSD-ppc64" => {
+inherit_from => [ "BSD-generic64" ],
+cflags => add("-m64"),
+cxxflags => add("-m64"),
+lib_cppflags => add("-DB_ENDIAN"),
+asm_arch => 'ppc64',
+perlasm_scheme => "linux64",
+},
+
+"BSD-ppc64le" => {
+inherit_from => [ "BSD-generic64" ],
+cflags => add("-m64"),
+cxxflags => add("-m64"),
+lib_cppflags => add("-DL_ENDIAN"),
+asm_arch => 'ppc64',
+perlasm_scheme => "linux64le",
+},
+
"bsdi-elf-gcc" => {
inherit_from => [ "BASE_unix" ],
CC => "gcc",
diff --git a/Configure b/Configure
index b00b91ac63..f48b7ab075 100755
--- a/Configure
+++ b/Configure
@@ -1549,7 +1549,7 @@ my %predefined_CXX = $config{CXX}
unless ($disabled{asm}) {
# big endian systems can use ELFv2 ABI
-if ($target eq "linux-ppc64") {
+if ($target eq "linux-ppc64" || $target eq "BSD-ppc64") {
$target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} ==
2);
}
}
diff --git a/crypto/ppccap.c b/crypto/ppccap.c
index dca3c5342b..da371a5345 100644
--- a/crypto/ppccap.c
+++ b/crypto/ppccap.c
@@ -117,14 +117,18 @@ static unsigned long getauxval(unsigned long key)
#endif
/* I wish was universally available */
-#define HWCAP 16 /* AT_HWCAP */
+#ifndef AT_HWCAP
+# define AT_HWCAP 16 /* AT_HWCAP */
+#endif
#define HWCAP_PPC64 (1U << 30)
#define HWCAP_ALTIVEC (1U << 28)
#define HWCAP_FPU (1U << 27)
#define HWCAP_POWER6_EXT(1U << 9)
#define HWCAP_VSX (1U << 7)
-#define HWCAP2 26 /* AT_HWCAP2 */
+#ifndef AT_HWCAP2
+# define AT_HWCAP2 26 /* AT_HWCAP2 */
+#endif
#define HWCAP_VEC_CRYPTO(1U << 25)
#define HWCAP_ARCH_3_00 (1U << 23)
@@ -215,8 +219,8 @@ void OPENSSL_cpuid_setup(void)
#ifdef OSSL_IMPLEMENT_GETAUXVAL
{
-unsigned long hwcap = getauxval(HWCAP);
-unsigned long hwcap2 = getauxval(HWCAP2);
+unsigned long hwcap = getauxval(AT_HWCAP);
+unsigned long hwcap2 = getauxval(AT_HWCAP2);
if (hwcap & HWCAP_FPU) {
OPENSSL_ppccap_P |= PPC_FPU;
diff --git a/util/perl/OpenSSL/config.pm b/util/perl/OpenSSL/config.pm
index e3802ade43..50efef423a 100755
--- a/util/perl/OpenSSL/config.pm
+++ b/util/perl/OpenSSL/config.pm
@@ -739,8 +739,9 @@ EOF
disable => [ 'sse2' ] } ],
[ 'alpha.*-.*-.*bsd.*', { target => "BSD-generic64",
defines => [ 'L_ENDIAN' ] } ],
- [ 'powerpc64-.*-.*bsd.*', { target => "BSD-generic64",
-defines => [ 'B_ENDIAN' ] } ],
+ [ 'powerpc-.*-.*bsd.*', { target => "BSD-ppc" } ],
+ [ 'powerpc64-.*-.*bsd.*', { target => "BSD-ppc64" } ],
+ [ 'powerpc64le-.*-.*bsd.*', { target => "BSD-ppc64le" } ],
[ 'sparc64-.*-.*bsd.*', { target => "BSD-sparc64" } ],
[ 'ia64-.*-.*bsd.*',{ target => "BSD-ia64" } ],
[ 'x86_64-.*-dragonfly.*', { target => "BSD-x86_64" } ],
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-3Dqd_0_MulOTlHne1IxTRELXXnGni8d68xSVF-2BUCe3a7Ux-2BjeH9dewowdn8b-2BZTwO7v1dYRE0v3hj09YSNA8hF9wRtvkX06oN0gp5fkMAUnLWNqq-2FQ4pTSiFh3TIkuZAmEhC4GeVtTUkAYLpSLYMep1TLV72z41WWa0XSCg-2BLgKckMkQ-2FbwwyNQ5qMcgyAM6Dg0EYupmAY8Y7apKAdS0Acc6vIlb3Vnh8ecbWUMmSD1MhsOV2k-3D Build ID: 422597 Analysis Summary: New defects found: 0 Defects eliminated: 0
[openssl] openssl-3.0 update
The branch openssl-3.0 has been updated
via 35f45ae0078f9972a4ea887f59670a7e8f346f94 (commit)
from 24dd9fc4c6c8341cd7f81d5e31513e59fcb934cf (commit)
- Log -
commit 35f45ae0078f9972a4ea887f59670a7e8f346f94
Author: Gerd Hoffmann
Date: Tue Dec 7 10:22:38 2021 +0100
rename MIN() macro
MIN is a rather generic name and results in a name clash when trying to
port tianocore over to openssl 3.0. Use the usual ossl prefix and
rename the macro to ossl_min() to solve this.
CLA: trivial
Signed-off-by: Gerd Hoffmann
Reviewed-by: Tomas Mraz
Reviewed-by: Paul Dale
(Merged from https://github.com/openssl/openssl/pull/17219)
(cherry picked from commit f4f77c2d9756cee12875397276799a93f057d412)
---
Summary of changes:
providers/implementations/kdfs/kbkdf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/providers/implementations/kdfs/kbkdf.c
b/providers/implementations/kdfs/kbkdf.c
index 01f7f0d4fd..5f30b037d9 100644
--- a/providers/implementations/kdfs/kbkdf.c
+++ b/providers/implementations/kdfs/kbkdf.c
@@ -46,7 +46,7 @@
#include "e_os.h"
-#define MIN(a, b) ((a) < (b)) ? (a) : (b)
+#define ossl_min(a, b) ((a) < (b)) ? (a) : (b)
typedef enum {
COUNTER = 0,
@@ -195,7 +195,7 @@ static int derive(EVP_MAC_CTX *ctx_init, kbkdf_mode mode,
unsigned char *iv,
goto done;
to_write = ko_len - written;
-memcpy(ko + written, k_i, MIN(to_write, h));
+memcpy(ko + written, k_i, ossl_min(to_write, h));
written += h;
k_i_len = h;
[openssl] master update
The branch master has been updated
via f4f77c2d9756cee12875397276799a93f057d412 (commit)
from 684326d3bd3131debcdc410790e8dcf16f96103f (commit)
- Log -
commit f4f77c2d9756cee12875397276799a93f057d412
Author: Gerd Hoffmann
Date: Tue Dec 7 10:22:38 2021 +0100
rename MIN() macro
MIN is a rather generic name and results in a name clash when trying to
port tianocore over to openssl 3.0. Use the usual ossl prefix and
rename the macro to ossl_min() to solve this.
CLA: trivial
Signed-off-by: Gerd Hoffmann
Reviewed-by: Tomas Mraz
Reviewed-by: Paul Dale
(Merged from https://github.com/openssl/openssl/pull/17219)
---
Summary of changes:
providers/implementations/kdfs/kbkdf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/providers/implementations/kdfs/kbkdf.c
b/providers/implementations/kdfs/kbkdf.c
index a81cc6e0c0..22fc7b86ad 100644
--- a/providers/implementations/kdfs/kbkdf.c
+++ b/providers/implementations/kdfs/kbkdf.c
@@ -46,7 +46,7 @@
#include "e_os.h"
-#define MIN(a, b) ((a) < (b)) ? (a) : (b)
+#define ossl_min(a, b) ((a) < (b)) ? (a) : (b)
typedef enum {
COUNTER = 0,
@@ -197,7 +197,7 @@ static int derive(EVP_MAC_CTX *ctx_init, kbkdf_mode mode,
unsigned char *iv,
goto done;
to_write = ko_len - written;
-memcpy(ko + written, k_i, MIN(to_write, h));
+memcpy(ko + written, k_i, ossl_min(to_write, h));
written += h;
k_i_len = h;
