[pull] master from openssl:master

.codespellrc

@@ -332,6 +332,7 @@ skip =
     *.asc,
     *.bin,
     *.crt,
+    *.csr,
     *.css.map,
     *.eps,
     *.fr.utf-8,
@@ -441,6 +442,7 @@ skip =
     CREDITS,
     CREDITS.TXT,
     DONATIONS,
+    external/*,
     jquery.js,
     jquery.min.map,
     localization*-[a-z][a-z]_[a-zA-Z][a-zA-Z].*,

.gitignore

@@ -301,8 +301,6 @@ providers/implementations/rands/test_rng.inc
 
 # Misc auto generated files
 /doc/man7/openssl_user_macros.pod
-/tools/c_rehash
-/tools/c_rehash.pl
 /util/shlib_wrap.sh
 /util/wrap.pl
 /tags

CHANGES.md

@@ -32,6 +32,10 @@ OpenSSL 4.0
 
 ### Changes between 3.6 and 4.0 [xx XXX xxxx]
 
+ * The script tool `c_rehash` was removed. Use `openssl rehash` instead.
+
+   *Norbert Pocs*
+
  * The crypto-mdebug-backtrace configuration option has been entirely removed.
    The option has been a no-op since 1.0.2.
 

Configurations/windows-makefile.tmpl

@@ -584,10 +584,10 @@ install_programs: install_runtime_libs build_inst_programs
 	@if not "$(INSTALL_PROGRAMS)"=="" \
 	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMS) \
                                         "$(INSTALLTOP)\bin"
-	@if not "$(INSTALL_PROGRAMS)"=="" \
+	@if not "$(INSTALL_PROGRAMPDBS)"=="" \
 	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMPDBS) \
                                         "$(INSTALLTOP)\bin"
-	@if not "$(INSTALL_PROGRAMS)"=="" \
+	@if not "$(BIN_SCRIPTS)"=="" \
 	 "$(PERL)" "$(SRCDIR)\util\copy.pl" $(BIN_SCRIPTS) \
                                         "$(INSTALLTOP)\bin"
 

NEWS.md

@@ -27,6 +27,8 @@ OpenSSL 4.0
 
 ### Major changes between OpenSSL 3.6 and OpenSSL 4.0 [under development]
 
+  * The script tool `c_rehash` was removed. Use `openssl rehash` instead.
+
   * ENGINE support was removed. The `no-engine` build option and the
    `OPENSSL_NO_ENGINE` macro is always present.
 

VMS/openssl_utils.com.in

@@ -5,10 +5,3 @@ $	v    := {- sprintf "%02d", split(/\./, $config{version}) -}
 $
 $	OPENSSL'v'	:== $OSSL$EXE:OPENSSL'v'
 $	OPENSSL		:== $OSSL$EXE:OPENSSL'v'
-$
-$	IF F$TYPE(PERL) .EQS. "STRING"
-$	THEN
-$	    C_REHASH	:== 'PERL' OSSL$EXE:c_rehash.pl
-$	ELSE
-$	    WRITE SYS$ERROR "NOTE: no perl => no C_REHASH"
-$	ENDIF

apps/rehash.c

@@ -588,7 +588,7 @@ const OPTIONS rehash_options[] = {
 
 int rehash_main(int argc, char **argv)
 {
-    BIO_printf(bio_err, "Not available; use c_rehash script\n");
+    BIO_printf(bio_err, "Not available\n");
     return 1;
 }
 

build.info

@@ -1,7 +1,7 @@
 # Note that some of these directories are filtered in Configure.  Look for
 # %skipdir there for further explanations.
 
-SUBDIRS=crypto ssl apps util tools fuzz providers doc
+SUBDIRS=crypto ssl apps util fuzz providers doc
 IF[{- !$disabled{tests} -}]
   SUBDIRS=test
 ENDIF

crypto/bio/bio_lib.c

@@ -429,7 +429,7 @@ int BIO_sendmmsg(BIO *b, BIO_MSG *msg,
 
     if (HAS_CALLBACK(b))
         ret = (size_t)bio_call_callback(b, BIO_CB_SENDMMSG | BIO_CB_RETURN,
-            (void *)&args, ret, 0, 0, (long)ret, NULL);
+            (void *)&args, ret, 0, 0, (long)ret, msgs_processed);
 
     return ret > 0;
 }
@@ -476,7 +476,7 @@ int BIO_recvmmsg(BIO *b, BIO_MSG *msg,
 
     if (HAS_CALLBACK(b))
         ret = (size_t)bio_call_callback(b, BIO_CB_RECVMMSG | BIO_CB_RETURN,
-            (void *)&args, ret, 0, 0, (long)ret, NULL);
+            (void *)&args, ret, 0, 0, (long)ret, msgs_processed);
 
     return ret > 0;
 }