[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  0b3fe363e6188dcb854d480180c9af91cc613f2c (commit)
       via  50360c1a4b6584c404c62c3ac7631ba0ce3a88be (commit)
      from  3d9d1ce52904660757dadeb629926932abe25158 (commit)


- Log -----------------------------------------------------------------
commit 0b3fe363e6188dcb854d480180c9af91cc613f2c
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jun 4 10:25:00 2021 +0200

    make update-fips-checksums
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15615)

commit 50360c1a4b6584c404c62c3ac7631ba0ce3a88be
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jun 4 10:19:40 2021 +0200

    FIPS: don't include crypto/passphrase.c in libfips.a
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15615)

-----------------------------------------------------------------------

Summary of changes:
 crypto/build.info                | 4 ++--
 providers/fips-sources.checksums | 8 +++-----
 providers/fips.checksum          | 2 +-
 providers/fips.module.sources    | 2 --
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/crypto/build.info b/crypto/build.info
index 9d8eda2884..efca6cc105 100644
--- a/crypto/build.info
+++ b/crypto/build.info
@@ -95,13 +95,13 @@ $UTIL_COMMON=\
         cryptlib.c params.c params_from_text.c bsearch.c ex_data.c o_str.c \
         threads_pthread.c threads_win.c threads_none.c initthread.c \
         context.c sparse_array.c asn1_dsa.c packet.c param_build.c \
-        param_build_set.c der_writer.c passphrase.c threads_lib.c params_dup.c
+        param_build_set.c der_writer.c threads_lib.c params_dup.c
 
 SOURCE[../libcrypto]=$UTIL_COMMON \
         mem.c mem_sec.c \
         cversion.c info.c cpt_err.c ebcdic.c uid.c o_time.c o_dir.c \
         o_fopen.c getenv.c o_init.c init.c trace.c provider.c provider_child.c \
-        punycode.c
+        punycode.c passphrase.c
 SOURCE[../providers/libfips.a]=$UTIL_COMMON
 
 SOURCE[../libcrypto]=$UPLINKSRC
diff --git a/providers/fips-sources.checksums b/providers/fips-sources.checksums
index e0b4a4a6d4..b56281b287 100644
--- a/providers/fips-sources.checksums
+++ b/providers/fips-sources.checksums
@@ -250,7 +250,6 @@ c2fe815fb3fd5efe9a6544cae55f9469063a0f6fb728361737b927f6182ae0bb  crypto/param_b
 07299afb0e8a7f5a7b43fef290c1fc1e280e4ca18472e7bb44e6a7e1c7efc027  crypto/params.c
 4f2a8c9acf5898fdc1e4bf98813049947221cd9a1db04faaa490250591f54cb4  crypto/params_dup.c
 d0f6af3e89a693f0327e1bf073666cbec6786220ef3b3688ef0be9539d5ab6bf  crypto/params_from_text.c
-0dd202ec1def47c12852a8ae4bfaadb74f7fe968d68def631fe3ac671aac943f  crypto/passphrase.c
 2140778d5f35e503e22b173736e18ff84406f6657463e8ff9e7b91a78aa686d3  crypto/property/defn_cache.c
 e7ee9ae467238875a413c44552af3937942b4e61a8aa3af6bee81a456d9daad1  crypto/property/property.c
 d2ea0144cf661fe3369b2f1cae22409e2155313eaeed8eb8497aa2ab7a88e1ac  crypto/property/property_local.h
@@ -377,7 +376,6 @@ b02701592960eb4608bb83b297eed90184004828c7fc03ea81568062f347623d  include/intern
 5df7377027b7c0640417441dea147eb0d95a0bd6b7a1a7e7f2a49cf4107faf87  include/internal/numbers.h
 ea1bec4f1fff37aef8d4a62745bb451baa3e3ad20ba1bc68920a24f5cbb2f0a7  include/internal/packet.h
 dd7ddecf30bef3002313e6b776ce34d660931e783b2f6edacf64c7c6e729e688  include/internal/param_build_set.h
-54ec20cba51d1284f5da9b605823c344a68adb5f19c2c5e6f569aeb19cc70a7e  include/internal/passphrase.h
 6d08ed9c307c5d85dce8baf7ee3fc358bfc53b9026760884b2d7e4a051c5a2bd  include/internal/property.h
 727326afb3d33fdffdf26471e313f27892708318c0934089369e4b28267e2635  include/internal/propertyerr.h
 f214a3d1ebe1109b739f0846e26ba2cd644759e8546a218b202886450018d34e  include/internal/provider.h
@@ -389,9 +387,9 @@ f214a3d1ebe1109b739f0846e26ba2cd644759e8546a218b202886450018d34e  include/intern
 415b725d7f949a6191ab7bb30b48931bafc01c7aa93607e529fabbc853a4ddc5  include/internal/tlsgroups.h
 b24938409313384024524cbde837690d83119bcb70fb289b38cb7efa8e082852  include/internal/tsan_assist.h
 2b38fb6e65d549aca3b2c76907daf67124f395251c0261dec26faa54da8d6d73  include/openssl/aes.h
-323549254bf7055fd2928253f2fb307cd97903d32716406ac5b11c990f4d88e3  include/openssl/asn1.h.in
+17fdc0e806fcb601e1013b6fbccdb9876a14aaa545dcf69120f4e72edd20dc8c  include/openssl/asn1.h.in
 d4733dcd490b3a2554eaf859d1ea964fe76f7d24f78e42be1094bdad6dee7429  include/openssl/asn1err.h
-23809ecb0bcc5d870a776a322f26f1f7339d2fabc275931b5bd0619b6b18e7c9  include/openssl/asn1t.h.in
+1550474ee05423896ec4abfb6346f1bc44c7be22329efac9ea25de10e81d549c  include/openssl/asn1t.h.in
 d23e74122090a71268818a8162bb0642d292b931eed2188f4f3a5c9083227a01  include/openssl/bio.h.in
 0a26138aaded05cafe2326e11fdc19b28408e054cfe3dda40d45ef95ce8136b0  include/openssl/bioerr.h
 7d1f9880976a926ba6e0cad08e8de6f326aae48d8350b499aa79127f63d4d108  include/openssl/bn.h
@@ -466,7 +464,7 @@ c169a015d7be52b7b99dd41c418a48d97e52ad21687c39c512a83a7c3f3ddb70  include/openss
 ffd0b00e9fdb307c6f4369fa52005033ff4746cf49dd82bb9dfae1a83532e6e0  include/openssl/types.h
 f37b0da67078c8c220c442499e02f92dfe240f6d77ec942f2a562a18f338284a  include/openssl/ui.h.in
 558433ae747ebf3d9a71d583b7a7ee8c5476f3bef38d97a1f88bdcace4c2f311  include/openssl/uierr.h
-fa88f86a4643441ecd6779894bb9533f63c275b5a871bae6687905185f315f94  include/openssl/x509.h.in
+fb9db84c7609618557163360835a1bffbef1b8dfb161922e4bc74fa5e0ba8627  include/openssl/x509.h.in
 7aea205aa1cc5472f7ec5e02c23435a4520af3883eff43ce2341a88abb5dcd4c  include/openssl/x509_vfy.h.in
 9e6409eddfa13a469c1da6c5b562825381da2eb4da3c08546aa1182a4ec54726  include/openssl/x509err.h
 8ddb7bd65c766317f6f20ff615e4d0ddc99bc4ee0d6ec149e3834b8d4fe11a05  include/openssl/x509v3.h.in
diff --git a/providers/fips.checksum b/providers/fips.checksum
index c712c1c4ea..8e6ef45b0f 100644
--- a/providers/fips.checksum
+++ b/providers/fips.checksum
@@ -1 +1 @@
-ef592dcb3367315f78795c64d131ca9ff062d1f6ca8702e1eef4b417e9b336a2  providers/fips-sources.checksums
+ab3353a9f54a8efae5171b36a3ec11fa17662b4e3f3f68cdd3d0b9b0af41d117  providers/fips-sources.checksums
diff --git a/providers/fips.module.sources b/providers/fips.module.sources
index be4fc0de8f..262500ef1e 100644
--- a/providers/fips.module.sources
+++ b/providers/fips.module.sources
@@ -250,7 +250,6 @@ crypto/param_build_set.c
 crypto/params.c
 crypto/params_dup.c
 crypto/params_from_text.c
-crypto/passphrase.c
 crypto/property/defn_cache.c
 crypto/property/property.c
 crypto/property/property_local.h
@@ -377,7 +376,6 @@ include/internal/nelem.h
 include/internal/numbers.h
 include/internal/packet.h
 include/internal/param_build_set.h
-include/internal/passphrase.h
 include/internal/property.h
 include/internal/propertyerr.h
 include/internal/provider.h