date:20210713

[openssl] master update

2021-07-13 Thread Dr . Paul Dale

The branch master has been updated
   via  4e0383d8519373372c899380842adad7ef887e16 (commit)
  from  53111a88ce5081f44a1775ddb11765491f115f50 (commit)


- Log -
commit 4e0383d8519373372c899380842adad7ef887e16
Author: Syrone Wong 
Date:   Tue Jul 13 10:04:56 2021 +0800

Fix OSSL_TRACE9 missing arg9

Signed-off-by: Syrone Wong 

CLA: trivial

Reviewed-by: Tim Hudson 
Reviewed-by: Matthias St. Pierre 
Reviewed-by: Richard Levitte 
Reviewed-by: Paul Dale 
(Merged from https://github.com/openssl/openssl/pull/16060)

---

Summary of changes:
 include/openssl/trace.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openssl/trace.h b/include/openssl/trace.h
index b3a29ea8c4..2820013367 100644
--- a/include/openssl/trace.h
+++ b/include/openssl/trace.h
@@ -302,7 +302,7 @@ void OSSL_trace_end(int category, BIO *channel);
 OSSL_TRACEV(category, (trc_out, format, arg1, arg2, arg3, arg4, arg5, 
arg6, arg7))
 # define OSSL_TRACE8(category, format, arg1, arg2, arg3, arg4, arg5, arg6, 
arg7, arg8) \
 OSSL_TRACEV(category, (trc_out, format, arg1, arg2, arg3, arg4, arg5, 
arg6, arg7, arg8))
-# define OSSL_TRACE9(category, format, arg1, arg2, arg3, arg4, arg5, arg6, 
arg7, arg8) \
+# define OSSL_TRACE9(category, format, arg1, arg2, arg3, arg4, arg5, arg6, 
arg7, arg8, arg9) \
 OSSL_TRACEV(category, (trc_out, format, arg1, arg2, arg3, arg4, arg5, 
arg6, arg7, arg8, arg9))
 
 # ifdef  __cplusplus

[openssl] master update

2021-07-13 Thread Richard Levitte

The branch master has been updated
   via  53111a88ce5081f44a1775ddb11765491f115f50 (commit)
  from  db226bf20f350ea62d3c649a4707fcdd78bbaea9 (commit)


- Log -
commit 53111a88ce5081f44a1775ddb11765491f115f50
Author: Richard Levitte 
Date:   Mon Jul 12 07:29:02 2021 +0200

Avoid empty lines in nmake rule bodies

nmake is tolerant of those empty lines, but jom isn't.  That tolerance
isn't standard make behaviour, so we lean towards avoiding them.

We simply use '@rem' instead.

Fixes #16014

Reviewed-by: Tomas Mraz 
Reviewed-by: Paul Dale 
(Merged from https://github.com/openssl/openssl/pull/16048)

---

Summary of changes:
 Configurations/windows-makefile.tmpl | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Configurations/windows-makefile.tmpl 
b/Configurations/windows-makefile.tmpl
index 43b29baab4..fc40e61144 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -429,28 +429,28 @@ build_apps build_tests: build_programs
 # Convenience target to prebuild all generated files, not just the mandatory
 # ones
 build_all_generated: $(GENERATED_MANDATORY) $(GENERATED) build_docs
-   @{- output_off() if $disabled{makedepend}; "" -}
+   @{- output_off() if $disabled{makedepend}; "\@rem" -}
@$(ECHO) "Warning: consider configuring with no-makedepend, because if"
@$(ECHO) " target system doesn't have $(PERL),"
@$(ECHO) " then make will fail..."
-   @{- output_on() if $disabled{makedepend}; "" -}
+   @{- output_on() if $disabled{makedepend}; "\@rem" -}
 
 all: build_sw build_docs
 
 test: tests
 {- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep 
copy-utils
-   @{- output_off() if $disabled{tests}; "" -}
+   @{- output_off() if $disabled{tests}; "\@rem" -}
cmd /C "set "SRCTOP=$(SRCDIR)" & set "BLDTOP=$(BLDDIR)" & set 
"PERL=$(PERL)" & set "FIPSKEY=$(FIPSKEY)" & "$(PERL)" 
"$(SRCDIR)\test\run_tests.pl" $(TESTS)"
@{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
@$(ECHO) "Tests are not supported with your chosen Configure options"
-   @{- output_on() if !$disabled{tests}; "" -}
+   @{- output_on() if !$disabled{tests}; "\@rem" -}
 
 list-tests:
-   @{- output_off() if $disabled{tests}; "" -}
+   @{- output_off() if $disabled{tests}; "\@rem" -}
@cmd /C "set "SRCTOP=$(SRCDIR)" & "$(PERL)" 
"$(SRCDIR)\test\run_tests.pl" list"
@{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
@$(ECHO) "Tests are not supported with your chosen Configure options"
-   @{- output_on() if !$disabled{tests}; "" -}
+   @{- output_on() if !$disabled{tests}; "\@rem" -}
 
 install: install_sw install_ssldirs install_docs
 
@@ -465,11 +465,11 @@ clean: libclean
-rd /Q /S $(HTMLDOCS3_BLDDIRS)
-rd /Q /S $(HTMLDOCS5_BLDDIRS)
-rd /Q /S $(HTMLDOCS7_BLDDIRS)
-   {- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) -}
-   {- join("\n\t", map { "-del /Q /F $_" } @MODULES) -}
-   {- join("\n\t", map { "-del /Q /F $_" } @SCRIPTS) -}
-   {- join("\n\t", map { "-del /Q /F $_" } @GENERATED_MANDATORY) -}
-   {- join("\n\t", map { "-del /Q /F $_" } @GENERATED) -}
+   {- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) || "\@rem" -}
+   {- join("\n\t", map { "-del /Q /F $_" } @MODULES) || "\@rem" -}
+   {- join("\n\t", map { "-del /Q /F $_" } @SCRIPTS) || "\@rem" -}
+   {- join("\n\t", map { "-del /Q /F $_" } @GENERATED_MANDATORY) || 
"\@rem" -}
+   {- join("\n\t", map { "-del /Q /F $_" } @GENERATED) || "\@rem" -}
-del /Q /S /F *.d *.obj *.pdb *.ilk *.manifest
-del /Q /S /F engines\*.lib engines\*.exp
-del /Q /S /F apps\*.lib apps\*.rc apps\*.res apps\*.exp
@@ -481,9 +481,9 @@ distclean: clean
-del /Q /F makefile
 
 depend:
-   @ {- output_off() if $disabled{makedepend}; "" -}
+   @ {- output_off() if $disabled{makedepend}; "\@rem" -}
@ "$(PERL)" "$(SRCDIR)\util\add-depends.pl" "{- $target{makedep_scheme} 
-}"
-   @ {- output_on() if $disabled{makedepend}; "" -}
+   @ {- output_on() if $disabled{makedepend}; "\@rem" -}
 
 # Install helper targets #

[openssl] OpenSSL_1_1_1-stable update

2021-07-13 Thread Richard Levitte

The branch OpenSSL_1_1_1-stable has been updated
   via  b46a26b3ade22be5ba4c39bf89c66f17d7900944 (commit)
  from  474cd196d628b1f91efa32827b403e2c1d896f81 (commit)


- Log -
commit b46a26b3ade22be5ba4c39bf89c66f17d7900944
Author: Richard Levitte 
Date:   Mon Jul 12 07:26:36 2021 +0200

Avoid empty lines in nmake rule bodies

nmake is tolerant of those empty lines, but jom isn't.  That tolerance
isn't standard make behaviour, so we lean towards avoiding them.

We simply use '@rem' instead.

Fixes #16014

Reviewed-by: Tomas Mraz 
Reviewed-by: Paul Dale 
(Merged from https://github.com/openssl/openssl/pull/16047)

---

Summary of changes:
 Configurations/windows-makefile.tmpl | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/Configurations/windows-makefile.tmpl 
b/Configurations/windows-makefile.tmpl
index 9351149fe8..13716e0644 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -324,15 +324,15 @@ build_apps build_tests: build_programs
 # Convenience target to prebuild all generated files, not just the mandatory
 # ones
 build_all_generated: $(GENERATED_MANDATORY) $(GENERATED)
-   @{- output_off() if $disabled{makedepend}; "" -}
+   @{- output_off() if $disabled{makedepend}; "\@rem" -}
@$(ECHO) "Warning: consider configuring with no-makedepend, because if"
@$(ECHO) " target system doesn't have $(PERL),"
@$(ECHO) " then make will fail..."
-   @{- output_on() if $disabled{makedepend}; "" -}
+   @{- output_on() if $disabled{makedepend}; "\@rem" -}
 
 test: tests
 {- dependmagic('tests'); -}: build_programs_nodep build_engines_nodep
-   @{- output_off() if $disabled{tests}; "" -}
+   @{- output_off() if $disabled{tests}; "\@rem" -}
-mkdir $(BLDDIR)\test\test-runs
set SRCTOP=$(SRCDIR)
set BLDTOP=$(BLDDIR)
@@ -341,17 +341,17 @@ test: tests
set OPENSSL_ENGINES=$(MAKEDIR)\engines
set OPENSSL_DEBUG_MEMORY=on
"$(PERL)" "$(SRCDIR)\test\run_tests.pl" $(TESTS)
-   @{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
+   @{- if ($disabled{tests}) { output_on(); } else { output_off(); } 
"\@rem" -}
@$(ECHO) "Tests are not supported with your chosen Configure options"
-   @{- output_on() if !$disabled{tests}; "" -}
+   @{- output_on() if !$disabled{tests}; "\@rem" -}
 
 list-tests:
-   @{- output_off() if $disabled{tests}; "" -}
+   @{- output_off() if $disabled{tests}; "\@rem" -}
@set SRCTOP=$(SRCDIR)
@"$(PERL)" "$(SRCDIR)\test\run_tests.pl" list
-   @{- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -}
+   @{- if ($disabled{tests}) { output_on(); } else { output_off(); } 
"\@rem" -}
@$(ECHO) "Tests are not supported with your chosen Configure options"
-   @{- output_on() if !$disabled{tests}; "" -}
+   @{- output_on() if !$disabled{tests}; "\@rem" -}
 
 install: install_sw install_ssldirs install_docs
 
@@ -362,7 +362,7 @@ libclean:
-del /Q /F $(LIBS) libcrypto.* libssl.* ossl_static.pdb
 
 clean: libclean
-   {- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) -}
+   {- join("\n\t", map { "-del /Q /F $_" } @PROGRAMS) || "\@rem" -}
-del /Q /F $(ENGINES)
-del /Q /F $(SCRIPTS)
-del /Q /F $(GENERATED_MANDATORY)
@@ -378,9 +378,9 @@ distclean: clean
-del /Q /F makefile
 
 depend:
-   @ {- output_off() if $disabled{makedepend}; "" -}
+   @ {- output_off() if $disabled{makedepend}; "\@rem" -}
@ "$(PERL)" "$(SRCDIR)\util\add-depends.pl" "VC"
-   @ {- output_on() if $disabled{makedepend}; "" -}
+   @ {- output_on() if $disabled{makedepend}; "\@rem" -}
 
 # Install helper targets #
 
@@ -413,10 +413,10 @@ install_dev: install_runtime_libs
@if "$(INSTALLTOP)"=="" ( $(ECHO) "INSTALLTOP should not be empty" & 
exit 1 )
@$(ECHO) "*** Installing development files"
@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(INSTALLTOP)\include\openssl"
-   @{- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" } 
(@{$target{defines}}, @{$config{defines}}); "" -}
+   @{- output_off() unless grep { $_ eq "OPENSSL_USE_APPLINK" } 
(@{$target{defines}}, @{$config{defines}}); "\@rem" -}
@"$(PERL)" "$(SRCDIR)\util\copy.pl" "$(SRCDIR)\ms\applink.c" \
   "$(INSTALLTOP)\include\openssl"
-   @{- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" } 
(@{$target{defines}}, @{$config{defines}}); "" -}
+   @{- output_on() unless grep { $_ eq "OPENSSL_USE_APPLINK" } 
(@{$target{defines}}, @{$config{defines}}); "\@rem" -}
@"$(PERL)" "$(SRCDIR)\util\copy.pl"

Coverity Scan: Analysis completed for OpenSSL-1.0.2

2021-07-13 Thread scan-admin



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-3DMyMf_MulOTlHne1IxTRELXXnGni8d68xSVF-2BUCe3a7Ux-2BjeH10iz0QwqHe4095m6sr87uctIrG9WQeVs7gWYYL7pe7MSg20i4HY95li2epTEWe76nVW-2B-2FbnMkhyUWI1J9TCTL3sLh07zz7ZKKAvdRCotu8j0bTpWBh-2FDzAwPmIOA4YHKCmKsT0BzIB3p5uCHcjPpCzn1pu-2FG49UFX5zaTZF9zGTIXWOy36YbOoMPJmz2o-2FFY-3D

Build ID: 396694

Analysis Summary:
   New defects found: 0
   Defects eliminated: 0

Coverity Scan: Analysis completed for openssl/openssl

2021-07-13 Thread scan-admin



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-3D51Ya_MulOTlHne1IxTRELXXnGni8d68xSVF-2BUCe3a7Ux-2BjeFG95GTDh1w0aKMwj1zE6K-2BNAxND7WAoRkqwnUVJVdP3jxYVbL7AwfH4A3zul3qDqxnb9RTP2Ro2G4nePtt76d5-2FakzDL6wR7udGFKUkGPsznWF8UJ51n3H3ONNBDOSjtDVu-2BKeShCuqwfRhCbf7TAJEhKhnJtX9YlEMgeI6oClXN6tNKG3Sr0oQQJMY5EGcXM-3D

Build ID: 396692

Analysis Summary:
   New defects found: 0
   Defects eliminated: 1

[openssl] master update

2021-07-13 Thread Dr . Paul Dale

The branch master has been updated
   via  db226bf20f350ea62d3c649a4707fcdd78bbaea9 (commit)
  from  a773e67b89208309032d14bd61cf2c2ed4708420 (commit)


- Log -
commit db226bf20f350ea62d3c649a4707fcdd78bbaea9
Author: Tianjia Zhang 
Date:   Mon Jul 12 11:22:59 2021 +0800

Remove executable mode attributes of non-executable files

Remove the executable attributes of some C code files and key files,
change the file mode from 0755 to 0644.

Signed-off-by: Tianjia Zhang 

Reviewed-by: Richard Levitte 
Reviewed-by: Paul Dale 
(Merged from https://github.com/openssl/openssl/pull/16045)

---

Summary of changes:
 apps/ca.c   |   0
 demos/digest/BIO_f_md.c |   0
 demos/digest/EVP_MD_stdin.c |   0
 test/insta.priv.pem |   0
 test/insta_ca.cert.pem  |   0
 .../65-test_cmp_vfy_data/IR_protected_0_extraCerts.der  | Bin
 .../65-test_cmp_vfy_data/IR_protected_2_extraCerts.der  | Bin
 test/recipes/65-test_cmp_vfy_data/insta.cert.pem|   0
 test/recipes/65-test_cmp_vfy_data/insta.priv.pem|   0
 test/recipes/65-test_cmp_vfy_data/insta_ca.cert.pem |   0
 10 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 apps/ca.c
 mode change 100755 => 100644 demos/digest/BIO_f_md.c
 mode change 100755 => 100644 demos/digest/EVP_MD_stdin.c
 mode change 100755 => 100644 test/insta.priv.pem
 mode change 100755 => 100644 test/insta_ca.cert.pem
 mode change 100755 => 100644 
test/recipes/65-test_cmp_vfy_data/IR_protected_0_extraCerts.der
 mode change 100755 => 100644 
test/recipes/65-test_cmp_vfy_data/IR_protected_2_extraCerts.der
 mode change 100755 => 100644 test/recipes/65-test_cmp_vfy_data/insta.cert.pem
 mode change 100755 => 100644 test/recipes/65-test_cmp_vfy_data/insta.priv.pem
 mode change 100755 => 100644 
test/recipes/65-test_cmp_vfy_data/insta_ca.cert.pem

diff --git a/apps/ca.c b/apps/ca.c
old mode 100755
new mode 100644
diff --git a/demos/digest/BIO_f_md.c b/demos/digest/BIO_f_md.c
old mode 100755
new mode 100644
diff --git a/demos/digest/EVP_MD_stdin.c b/demos/digest/EVP_MD_stdin.c
old mode 100755
new mode 100644
diff --git a/test/insta.priv.pem b/test/insta.priv.pem
old mode 100755
new mode 100644
diff --git a/test/insta_ca.cert.pem b/test/insta_ca.cert.pem
old mode 100755
new mode 100644
diff --git a/test/recipes/65-test_cmp_vfy_data/IR_protected_0_extraCerts.der 
b/test/recipes/65-test_cmp_vfy_data/IR_protected_0_extraCerts.der
old mode 100755
new mode 100644
diff --git a/test/recipes/65-test_cmp_vfy_data/IR_protected_2_extraCerts.der 
b/test/recipes/65-test_cmp_vfy_data/IR_protected_2_extraCerts.der
old mode 100755
new mode 100644
diff --git a/test/recipes/65-test_cmp_vfy_data/insta.cert.pem 
b/test/recipes/65-test_cmp_vfy_data/insta.cert.pem
old mode 100755
new mode 100644
diff --git a/test/recipes/65-test_cmp_vfy_data/insta.priv.pem 
b/test/recipes/65-test_cmp_vfy_data/insta.priv.pem
old mode 100755
new mode 100644
diff --git a/test/recipes/65-test_cmp_vfy_data/insta_ca.cert.pem 
b/test/recipes/65-test_cmp_vfy_data/insta_ca.cert.pem
old mode 100755
new mode 100644

[openssl] master update

[openssl] master update

[openssl] OpenSSL_1_1_1-stable update

Coverity Scan: Analysis completed for OpenSSL-1.0.2

Coverity Scan: Analysis completed for openssl/openssl

[openssl] master update

6 matches

Site Navigation

Mail list logo

Footer information