[openssl] master update

tomas at openssl.org tomas at openssl.org
Fri Jun 4 15:07:21 UTC 2021


The branch master has been updated
       via  0e0a47377f98ac45648d2a46e0f2dfd799b07ec6 (commit)
       via  085e3cecbdadde10e93abfb4dbd3e865aeed58d6 (commit)
      from  51cda01c61870c2433fbbd54d69f2267362ea608 (commit)


- Log -----------------------------------------------------------------
commit 0e0a47377f98ac45648d2a46e0f2dfd799b07ec6
Author: Tomas Mraz <tomas at openssl.org>
Date:   Thu Jun 3 15:26:52 2021 +0200

    Update fips checksums to drop the ssl headers
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15609)

commit 085e3cecbdadde10e93abfb4dbd3e865aeed58d6
Author: Tomas Mraz <tomas at openssl.org>
Date:   Thu Jun 3 15:22:05 2021 +0200

    Move libssl related defines used by fips provider to prov_ssl.h
    
    This nicely reduces the number of files considered as fips
    provider sources.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15609)

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

Summary of changes:
 crypto/packet.c                                    |  6 ++--
 crypto/rsa/rsa_pk1.c                               |  2 +-
 include/openssl/dtls1.h                            |  7 ++---
 include/openssl/prov_ssl.h                         | 34 +++++++++++++++++++++
 include/openssl/ssl.h.in                           |  3 +-
 include/openssl/ssl3.h                             |  2 +-
 include/openssl/tls1.h                             |  6 ++--
 providers/common/capabilities.c                    |  2 +-
 providers/fips-sources.checksums                   | 35 +++++++---------------
 providers/fips.checksum                            |  2 +-
 providers/fips.module.sources                      | 15 +---------
 providers/implementations/asymciphers/rsa_enc.c    |  2 +-
 .../ciphers/cipher_aes_cbc_hmac_sha.c              |  4 +--
 providers/implementations/ciphers/ciphercommon.c   |  2 +-
 .../implementations/ciphers/ciphercommon_block.c   |  2 +-
 15 files changed, 65 insertions(+), 59 deletions(-)
 create mode 100644 include/openssl/prov_ssl.h

diff --git a/crypto/packet.c b/crypto/packet.c
index 6cd1ed3ed3..80202bc08f 100644
--- a/crypto/packet.c
+++ b/crypto/packet.c
@@ -9,7 +9,7 @@
 
 #include "internal/cryptlib.h"
 #include "internal/packet.h"
-#include <openssl/sslerr.h>
+#include <openssl/err.h>
 
 #define DEFAULT_BUF_SIZE    256
 
@@ -105,7 +105,7 @@ static int wpacket_intern_init_len(WPACKET *pkt, size_t lenbytes)
     pkt->written = 0;
 
     if ((pkt->subs = OPENSSL_zalloc(sizeof(*pkt->subs))) == NULL) {
-        ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE);
+        ERR_raise(ERR_LIB_CRYPTO, ERR_R_MALLOC_FAILURE);
         return 0;
     }
 
@@ -352,7 +352,7 @@ int WPACKET_start_sub_packet_len__(WPACKET *pkt, size_t lenbytes)
         return 0;
 
     if ((sub = OPENSSL_zalloc(sizeof(*sub))) == NULL) {
-        ERR_raise(ERR_LIB_SSL, ERR_R_MALLOC_FAILURE);
+        ERR_raise(ERR_LIB_CRYPTO, ERR_R_MALLOC_FAILURE);
         return 0;
     }
 
diff --git a/crypto/rsa/rsa_pk1.c b/crypto/rsa/rsa_pk1.c
index f1eabf177c..89778e6c4d 100644
--- a/crypto/rsa/rsa_pk1.c
+++ b/crypto/rsa/rsa_pk1.c
@@ -20,7 +20,7 @@
 #include <openssl/rsa.h>
 #include <openssl/rand.h>
 /* Just for the SSL_MAX_MASTER_KEY_LENGTH value */
-#include <openssl/ssl.h>
+#include <openssl/prov_ssl.h>
 #include "internal/cryptlib.h"
 #include "crypto/rsa.h"
 #include "rsa_local.h"
diff --git a/include/openssl/dtls1.h b/include/openssl/dtls1.h
index 5553fb8c90..8a1cd95ce3 100644
--- a/include/openssl/dtls1.h
+++ b/include/openssl/dtls1.h
@@ -16,22 +16,21 @@
 #  define HEADER_DTLS1_H
 # endif
 
+# include <openssl/prov_ssl.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
 #include <openssl/opensslconf.h>
 
-# define DTLS1_VERSION                   0xFEFF
-# define DTLS1_2_VERSION                 0xFEFD
+/* DTLS*_VERSION constants are defined in prov_ssl.h */
 # ifndef OPENSSL_NO_DEPRECATED_3_0
 #  define DTLS_MIN_VERSION                DTLS1_VERSION
 #  define DTLS_MAX_VERSION                DTLS1_2_VERSION
 # endif
 # define DTLS1_VERSION_MAJOR             0xFE
 
-# define DTLS1_BAD_VER                   0x0100
-
 /* Special value for method supporting multiple versions */
 # define DTLS_ANY_VERSION                0x1FFFF
 
diff --git a/include/openssl/prov_ssl.h b/include/openssl/prov_ssl.h
new file mode 100644
index 0000000000..d3e0896c8e
--- /dev/null
+++ b/include/openssl/prov_ssl.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2021 The OpenSSL Project Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
+ * this file except in compliance with the License.  You can obtain a copy
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#ifndef OPENSSL_PROV_SSL_H
+# define OPENSSL_PROV_SSL_H
+# pragma once
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/* SSL/TLS related defines useful to providers */
+
+# define SSL_MAX_MASTER_KEY_LENGTH 48
+
+# define SSL3_VERSION                    0x0300
+# define TLS1_VERSION                    0x0301
+# define TLS1_1_VERSION                  0x0302
+# define TLS1_2_VERSION                  0x0303
+# define TLS1_3_VERSION                  0x0304
+# define DTLS1_VERSION                   0xFEFF
+# define DTLS1_2_VERSION                 0xFEFD
+# define DTLS1_BAD_VER                   0x0100
+
+# ifdef __cplusplus
+}
+# endif
+#endif /* OPENSSL_PROV_SSL_H */
diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in
index a227090263..2c34fd2a9a 100644
--- a/include/openssl/ssl.h.in
+++ b/include/openssl/ssl.h.in
@@ -42,6 +42,7 @@ use OpenSSL::stackhash qw(generate_stack_macros generate_const_stack_macros);
 # include <openssl/symhacks.h>
 # include <openssl/ct.h>
 # include <openssl/sslerr.h>
+# include <openssl/prov_ssl.h>
 
 #ifdef  __cplusplus
 extern "C" {
@@ -59,7 +60,7 @@ extern "C" {
 
 # define SSL_MIN_RSA_MODULUS_LENGTH_IN_BYTES     (512/8)
 # define SSL_MAX_KEY_ARG_LENGTH                  8
-# define SSL_MAX_MASTER_KEY_LENGTH               48
+/* SSL_MAX_MASTER_KEY_LENGTH is defined in prov_ssl.h */
 
 /* The maximum number of encrypt/decrypt pipelines we can support */
 # define SSL_MAX_PIPELINES  32
diff --git a/include/openssl/ssl3.h b/include/openssl/ssl3.h
index 9fc6b3abcb..e5a41faa05 100644
--- a/include/openssl/ssl3.h
+++ b/include/openssl/ssl3.h
@@ -212,7 +212,7 @@ extern "C" {
 # define SSL3_MD_CLIENT_FINISHED_CONST   "\x43\x4C\x4E\x54"
 # define SSL3_MD_SERVER_FINISHED_CONST   "\x53\x52\x56\x52"
 
-# define SSL3_VERSION                    0x0300
+/* SSL3_VERSION is defined in prov_ssl.h */
 # define SSL3_VERSION_MAJOR              0x03
 # define SSL3_VERSION_MINOR              0x00
 
diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index cd1f818c1a..d6e9331fa1 100644
--- a/include/openssl/tls1.h
+++ b/include/openssl/tls1.h
@@ -20,6 +20,7 @@
 
 # include <openssl/buffer.h>
 # include <openssl/x509.h>
+# include <openssl/prov_ssl.h>
 
 #ifdef  __cplusplus
 extern "C" {
@@ -30,10 +31,7 @@ extern "C" {
 #  define OPENSSL_TLS_SECURITY_LEVEL 1
 # endif
 
-# define TLS1_VERSION                    0x0301
-# define TLS1_1_VERSION                  0x0302
-# define TLS1_2_VERSION                  0x0303
-# define TLS1_3_VERSION                  0x0304
+/* TLS*_VERSION constants are defined in prov_ssl.h */
 # ifndef OPENSSL_NO_DEPRECATED_3_0
 #  define TLS_MAX_VERSION                TLS1_3_VERSION
 # endif
diff --git a/providers/common/capabilities.c b/providers/common/capabilities.c
index 781acae8db..f6d95197f0 100644
--- a/providers/common/capabilities.c
+++ b/providers/common/capabilities.c
@@ -12,7 +12,7 @@
 #include <openssl/core_dispatch.h>
 #include <openssl/core_names.h>
 /* For TLS1_VERSION etc */
-#include <openssl/ssl.h>
+#include <openssl/prov_ssl.h>
 #include <openssl/params.h>
 #include "internal/nelem.h"
 #include "internal/tlsgroups.h"
diff --git a/providers/fips-sources.checksums b/providers/fips-sources.checksums
index 95cb84e79e..e0b4a4a6d4 100644
--- a/providers/fips-sources.checksums
+++ b/providers/fips-sources.checksums
@@ -195,7 +195,7 @@ a7f3d371a6a1491a52282ed59a81e4d2f8d9b8d064900ddd8b2f667692241092  crypto/evp/evp
 abaf593aa548176d763ed54ba6a9a7b02e08868f801af0de17f8c1721c20fe5a  crypto/evp/evp_rand.c
 2a128617ec0178e9eeacbe41d75a5530755f41ea524cd124607543cf73456a0c  crypto/evp/evp_utils.c
 17389c71b88ac74928e538fc155badf5c4555dd181191d7a054b60b7fad7a755  crypto/evp/exchange.c
-b1f2104d2ad424fc5db6e547e2980a698bf7d62a2b249f66e4f2f7612e12dfab  crypto/evp/kdf_lib.c
+6bcf946bc6aeb6a8350b17ab16759a9db03cfc025637a296de2999ca254a6317  crypto/evp/kdf_lib.c
 67ee456b5aa1e6691dfe03af24ce27d43d8e1f59c9dc52a71f777e833a01817d  crypto/evp/kdf_meth.c
 0f4468e16e1f0b04a28b350688f20234a94eac355fd644be688a1576cd7d99fe  crypto/evp/kem.c
 b011ded0b5ee21c6d417df81e35ac70ddb8df0c65ba48990f303f09d7695554e  crypto/evp/keymgmt_lib.c
@@ -244,7 +244,7 @@ bdf25257b15eca206be4d950d2dd807ca5f058f91f54edbd7a0d312ed83eef8e  crypto/modes/o
 e55a816c356b2d526bc6e40c8b81afa02576e4d44c7d7b6bbe444fb8b01aad41  crypto/modes/wrap128.c
 608a04f387be2a509b4d4ad414b7015ab833e56b85020e692e193160f36883a2  crypto/modes/xts128.c
 ca8f63ee71797f51c2bf5629190897306b3308882feb3d64c982239f18e8b738  crypto/o_str.c
-5e3b9e03839582d4cf1e3f7f6fc661f2531bf99b189bdcf4654c56fee1d7ecf9  crypto/packet.c
+7b8d9f5dfe00460df5fbcfd4a5f2f36128020ebd2ced85ff5071b91f98740b2e  crypto/packet.c
 e30c9e30e4356621236136caf001ee60d51aac492a5bf0fb7f1022b973aec425  crypto/param_build.c
 c2fe815fb3fd5efe9a6544cae55f9469063a0f6fb728361737b927f6182ae0bb  crypto/param_build_set.c
 07299afb0e8a7f5a7b43fef290c1fc1e280e4ca18472e7bb44e6a7e1c7efc027  crypto/params.c
@@ -272,7 +272,7 @@ cf0b75cd54b61b9b9a290ef18d0ddce9fb26a029a54eb3f720d9b25188440f00  crypto/rsa/rsa
 5c60f6e05db82e13178d805deb1947b8eee4a905e6e77523d3b288da70a46bb5  crypto/rsa/rsa_none.c
 33de2accc3af530fd0a4758eb83d5e1d994bf49bac4512b01387dbae656e1a7d  crypto/rsa/rsa_oaep.c
 a2fd2e4e31ec53d01a575ccaf03bad5a270412ff66804cf0b5fa40492b89181d  crypto/rsa/rsa_ossl.c
-981df3d52719b65fd0f208e62116a0e90f6f7faa35fde90077bd5ddd0ede1859  crypto/rsa/rsa_pk1.c
+be3f39c1fcb777d6c0122061f9ef735d10a6bee95d67fcc1ca6ae2a664022d2b  crypto/rsa/rsa_pk1.c
 174a42e156be48927fe6d6bf0d95575619b8e643a99761275bff933bc3449722  crypto/rsa/rsa_pss.c
 bf6d300b7e7e9e512a47c5bd1f8713806ae3033a140d83dfae4a16ad58d11170  crypto/rsa/rsa_schemes.c
 3f269305314a812a343d74c182bff0a747e465c686af31ccc82f9adfa8616836  crypto/rsa/rsa_sign.c
@@ -392,8 +392,6 @@ b24938409313384024524cbde837690d83119bcb70fb289b38cb7efa8e082852  include/intern
 323549254bf7055fd2928253f2fb307cd97903d32716406ac5b11c990f4d88e3  include/openssl/asn1.h.in
 d4733dcd490b3a2554eaf859d1ea964fe76f7d24f78e42be1094bdad6dee7429  include/openssl/asn1err.h
 23809ecb0bcc5d870a776a322f26f1f7339d2fabc275931b5bd0619b6b18e7c9  include/openssl/asn1t.h.in
-cf4be859dba94326ba7d9e305fd7e7275bd11e534118c7b140a3a1c8dac01b76  include/openssl/async.h
-8ed44307406db3a25abebe94b792175f99ceb04ede8fdc5c84446c9622729a0a  include/openssl/asyncerr.h
 d23e74122090a71268818a8162bb0642d292b931eed2188f4f3a5c9083227a01  include/openssl/bio.h.in
 0a26138aaded05cafe2326e11fdc19b28408e054cfe3dda40d45ef95ce8136b0  include/openssl/bioerr.h
 7d1f9880976a926ba6e0cad08e8de6f326aae48d8350b499aa79127f63d4d108  include/openssl/bn.h
@@ -401,8 +399,6 @@ ea344bb0b690d4e47c99e83f6692b970c9b54a4520296bb2d3ddbcbdf0d51653  include/openss
 93954e6c450716e158948d67f64736a451ea9473d02f3a908f3bc8a96cf049a5  include/openssl/buffer.h
 9d48e6cab2ee98ae94d7113e4c65f000d97e125fdb3445642865ace3f34d06ac  include/openssl/buffererr.h
 8e772c24b051e59d2f65339f54584e3e44165a3eaf997d497faea764990130f5  include/openssl/cmac.h
-1eae6c12c4298d236b1ccefe3ebc28093fd8157214be16f8d34234b376002800  include/openssl/comp.h
-2c7c73adb2fa1da9d453d3776ce83f74e7fc354e268a92cb973abddfe14b7db5  include/openssl/comperr.h
 55aa91482d327d1784484922389e8277bdcdff7a7df27e84200d5c908bd40454  include/openssl/conf.h.in
 f20c3c845129a129f5e0b1dae970d86a5c96ab49f2e3f6f364734521e9e1abe3  include/openssl/conferr.h
 02a1baff7b71a298419c6c5dcb43eaa9cc13e9beeb88c03fb14854b4e84e8862  include/openssl/configuration.h.in
@@ -413,14 +409,11 @@ f20c3c845129a129f5e0b1dae970d86a5c96ab49f2e3f6f364734521e9e1abe3  include/openss
 d165f5c61bfe17ba366a3ba94afb30d3c8ce6b21e9cff59a15f3622f2654ae49  include/openssl/crypto.h.in
 06e9f521a6e98e104cdf37260ce967d928e25d424e0013f1feb3ff4da18eaec0  include/openssl/cryptoerr.h
 bbc82260cbcadd406091f39b9e3b5ea63146d9a4822623ead16fa12c43ab9fc6  include/openssl/cryptoerr_legacy.h
-24f276f5e1292fededcc70b02c002cf5ea3e747d403582f30d2e085e65a9813e  include/openssl/ct.h.in
-b0f19457b19e0341d13c33863695723272ec6534c708914b4ec75891589565fc  include/openssl/cterr.h
 fa3e6b6c2e6222424b9cd7005e3c5499a2334c831cd5d6a29256ce945be8cb1d  include/openssl/des.h
 3a57eceec58ab781d79cb0458c2251a233f45ba0ef8f414d148c55ac2dff1bc8  include/openssl/dh.h
 836130f5a32bbdce51b97b34758ed1b03a9d06065c187418eaf323dca6adfc6d  include/openssl/dherr.h
 92ae2c907fd56859e3ae28a085071611be5c9245879305cdf8bad027219e64b6  include/openssl/dsa.h
 335eb40a33cd1e95e7783bda2d031ec2bcf02cff8aa804ba3484d1354452b7ea  include/openssl/dsaerr.h
-e067fc6ddda9827d7c4f0675acd0cad2dc427d7d3559749cff3086fcaa34d959  include/openssl/dtls1.h
 3485a648e62685ec595954e2228be83bea1be4895a309fe64f49db1436a3f11e  include/openssl/e_os2.h
 bc9ec2be442a4f49980ba2c63c8f0da701de1f6e23d7db35d781658f833dd7b9  include/openssl/ebcdic.h
 8e301f2f8cfacda5d7de4f53e5592b523454cb93ba3c8029b628a6abf0ddb833  include/openssl/ec.h
@@ -430,7 +423,7 @@ cbbf74efc7fdb020f06840c856ad7fe97553944f4cc3c197fbb004de38158048  include/openss
 171a780183dd91350d2f7abed7ded9ce80dfdec8afaab5adcd843514bdbc7a43  include/openssl/engine.h
 fb510978001ebea15eee4c4c6cbeebb126a66e11117e6f6d9b9fb4be5057b92c  include/openssl/engineerr.h
 bfc224df9ef6ea16d0112dd8b1b1d9a09b8484a5a26f3f0c85041d7d5e83cf3b  include/openssl/err.h.in
-a9a8424e276c15f5691510e0ba414471f7f1892d2cefea697fd975ba0309e5cc  include/openssl/evp.h
+19619eac1e6555fb4596ebf02a5f5c16a9e72596b2d444488f7a60dfb396138b  include/openssl/evp.h
 5bd1b5dcd14067a1fe490d49df911002793c0b4f0bd4492cd8f71cfed7bf9f2a  include/openssl/evperr.h
 5381d96fe867a4ee0ebc09b9e3a262a0d7a27edc5f91dccfb010c7d713cd0820  include/openssl/fips_names.h
 b1d41beba560a41383f899a361b786e04f889106fb5960ec831b0af7996c9783  include/openssl/fipskey.h.in
@@ -456,6 +449,7 @@ fe6acd42c3e90db31aaafc2236a7d30ebfa53c4c07ea4d8265064c7fcb951970  include/openss
 fb453de1abc5ec8410586593921a66757441ecbfc4273349ddc6257c503a2000  include/openssl/pemerr.h
 74305b1bd8575cd0ef6c86eb1edd89a9a144b84d39d7f6740b7ce8cdad6f9d9c  include/openssl/pkcs7.h.in
 8394828da6fd7a794777320c955d27069bfef694356c25c62b7a9eb47cd55832  include/openssl/pkcs7err.h
+097615b849375e2903967521f76c570512e5be47b8159fdbcd31e433f8a4cca7  include/openssl/prov_ssl.h
 90fb37a1a564b989afca658dae8c78b0ba72ac1f4d1ffc0c52eb93e74e144603  include/openssl/proverr.h
 b97e8ad49b38683817387596aefec0abd5f4d572643beef48be4f7acba26768d  include/openssl/provider.h
 7c9b5f479d9b22cfc8db0976dddfc2a1ee6e757b436e01a2b4d2744bcb6d81a5  include/openssl/rand.h
@@ -466,15 +460,8 @@ c1015b77c444a3816d2ea7ad770f1c3b79a1e54887930af6dd662895701f3323  include/openss
 6586f2187991731835353de0ffad0b6b57609b495e53d0f32644491ece629eb2  include/openssl/safestack.h.in
 8578f881906486eb4d5c8f1631a469d3fc6b350e1ff8dc103db40391234ceb47  include/openssl/self_test.h
 d8da6697ce0f23b40c9a557940f030008bf1a53eff2739974f7bdb6b12b93b44  include/openssl/sha.h
-1d0b2696819d7eda4210fcf6f16f30540f536c5433b4ef48e68fb54e95d03d1b  include/openssl/srtp.h
-a59992f46c7b98e3c9738c7f00648d8e3b84b4a19e09cf87709042c0b9798108  include/openssl/ssl.h.in
-9c6d59db5867965f0fc281836f55c4cfb300e43b81c0a1d10ae57184b82e00ba  include/openssl/ssl2.h
-a7593d089430355601f02df740f407ea26e25a643815cb3ded336f9ee3ab6e44  include/openssl/ssl3.h
-28586b305c6b96889daedaf0e7ddb946c42089a0fdb57ee4e5e9b2382629473a  include/openssl/sslerr.h
-cd7bbe3d9bdaea20969cf9a388570ade19201f48f44b4bb860499d49590f9bfb  include/openssl/sslerr_legacy.h
 c169a015d7be52b7b99dd41c418a48d97e52ad21687c39c512a83a7c3f3ddb70  include/openssl/stack.h
 22d7584ad609e30e818b54dca1dfae8dea38913fffedd25cd540c550372fb9a6  include/openssl/symhacks.h
-b220280d27e4f30ea9605902b316d20953d1d4931c3d199321b9f46d9366d60d  include/openssl/tls1.h
 12026c3aa4b14d9083999a7e5098bd4273a4f2004ff1d397d65710b3d4bc6e2b  include/openssl/trace.h
 ffd0b00e9fdb307c6f4369fa52005033ff4746cf49dd82bb9dfae1a83532e6e0  include/openssl/types.h
 f37b0da67078c8c220c442499e02f92dfe240f6d77ec942f2a562a18f338284a  include/openssl/ui.h.in
@@ -485,7 +472,7 @@ fa88f86a4643441ecd6779894bb9533f63c275b5a871bae6687905185f315f94  include/openss
 8ddb7bd65c766317f6f20ff615e4d0ddc99bc4ee0d6ec149e3834b8d4fe11a05  include/openssl/x509v3.h.in
 f78e901b2260416773c6d7933de8771a03bbb2cc3073809f3c1715d4276789ff  include/openssl/x509v3err.h
 c0a9551efccf43f3dd748d4fd8ec897ddaabbc629c00ec1ad76ce983e1195a13  providers/common/bio_prov.c
-d0a26820a192f38a52d26846d40a677ce846b4808bdc0193e880d7bf39633f8e  providers/common/capabilities.c
+e7c39ef7b76668dae1470ce0edd7254da2937569762cebbf20e08fb97cb3324c  providers/common/capabilities.c
 f94b7435d4ec888ec30df1c611afa8b9eedbb59e905a2c7cb17cfc8c4b9b85b8  providers/common/der/der_digests_gen.c.in
 424d7b2ece984a0904b80c73e541400c6e2d50a285c397dd323b440a4f2a8d8e  providers/common/der/der_dsa_gen.c.in
 27ff361a5fbfc97cd41690ab26639708961d0507b60912f55f5919649842c6ae  providers/common/der/der_dsa_key.c
@@ -524,10 +511,10 @@ f74c0d672eb313139706a1839914a558d53c43737e7c54fd85edc38b33500097  providers/fips
 f822a03138e8b83ccaa910b89d72f31691da6778bf6638181f993ec7ae1167e3  providers/fips/self_test.h
 fe69e22b9e97277cbbe57139026357abd161b0eba2b8a7253b4e13647dd8760e  providers/fips/self_test_data.inc
 f2775b7effa96b7c925ed71bd8c90e74b6256e7ed28346f59de46dffecb3e5a0  providers/fips/self_test_kats.c
-cc53b8c68cb51193db6597b1e8c145c7b21e3576e74fcae7724692533fa81ceb  providers/implementations/asymciphers/rsa_enc.c
+f054b24ea53ad5db41dd7f37f20f42166ed68b832121a94858cb0173b1aaeb1d  providers/implementations/asymciphers/rsa_enc.c
 4db1826ecce8b60cb641bcd7a61430ec8cef73d2fe3cbc06aa33526afe1c954a  providers/implementations/ciphers/cipher_aes.c
 f9d4b30e7110c90064b990c07430bb79061f4436b06ccaa981b25c306cfbfaa2  providers/implementations/ciphers/cipher_aes.h
-fda0045a1d16514c12e27c6171e40d8a13d444b8e6ac526e44e9d507ec33adbf  providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
+89378cce6d31e8c2f221f9f29d0b17622624eb83e4ecec8465f7641f68352917  providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
 7668e5c1cac474ad7b0f28aa78ca885edf44815fe4a606a6cd328b3c02fac25a  providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.h
 26e0f28523b416ba4067e471061f5a11fd76f5dc8bfe57ce37a137cf5667630b  providers/implementations/ciphers/cipher_aes_cbc_hmac_sha1_hw.c
 aadd5bf80c25bc98325562e388515f3ab6841755c265e150177ee16013684e76  providers/implementations/ciphers/cipher_aes_cbc_hmac_sha256_hw.c
@@ -556,8 +543,8 @@ f358c4121a8a223e2c6cf009fd28b8a195520279016462890214e8858880f632  providers/impl
 3023eb3efb71ffe922e957acf4da65a124a8367a5fbe68a9d9f2fe8d583063d8  providers/implementations/ciphers/cipher_tdes.h
 9e07260067083c76d26eb0dd8a8bb4a8dac678812644ff88951a0661be70d9fd  providers/implementations/ciphers/cipher_tdes_common.c
 50645122f08ef4891cd96cace833bd550be7f5278ab785515fd61fe8993c8c25  providers/implementations/ciphers/cipher_tdes_hw.c
-3fd3a0e53984c114e74172a85f8321569877df00d193d5bd2e90e8be38507082  providers/implementations/ciphers/ciphercommon.c
-697e9f2254574cc93f0737456d0f3a275946296466a179bb5d0fea607c7a92fa  providers/implementations/ciphers/ciphercommon_block.c
+afa2f65f7795c1f9455119b59392ee8ac52aeea2a582cf565c37d7b1ed34ee7a  providers/implementations/ciphers/ciphercommon.c
+dd72ea861edf70b94197821ceb00e07165d550934a2e851d62afa5034b79f468  providers/implementations/ciphers/ciphercommon_block.c
 4b4106f85e36eb2c07acc5a3ca5ccd77b736b3ac46cc4af786cf57405ecd54b2  providers/implementations/ciphers/ciphercommon_ccm.c
 8b6828f188c2590c7d9c6cac13fa0eb6d38a522b0f2859e7c8a766580fa9b66e  providers/implementations/ciphers/ciphercommon_ccm_hw.c
 251aca4d087418e4fdac1390e1570b189b4076ba63a635d228784a05bb26e421  providers/implementations/ciphers/ciphercommon_gcm.c
@@ -599,7 +586,7 @@ e0812f2cb3f08ebf159671ef16e5c60afcf963e3c0724950ddb24a0023d57f77  providers/impl
 053a2be39a87f50b877ebdbbf799cf5faf8b2de33b04311d819d212ee1ea329b  providers/implementations/keymgmt/kdf_legacy_kmgmt.c
 f88ab5c9a4cdfa160df2b8f0f833725845caa25facc81de9c4a7881d1d2f27db  providers/implementations/keymgmt/mac_legacy_kmgmt.c
 464d6f9236351e7dc3b991f5bba142c7aabcf2db3c236367332a9dd0308ddfac  providers/implementations/keymgmt/rsa_kmgmt.c
-802adf06e101bd81d94edb8bc82ba23eac9aeae258e6f43f9005b32fabcd99c6  providers/implementations/macs/cmac_prov.c
+e25c8bfd205b0842ba8e7a0cbcf9f86b78c7d4d093655b8d45b23b8653d7358d  providers/implementations/macs/cmac_prov.c
 c774e2791484ea9a1ffed69958f9d05c139bbf53603a9621ae76c6e89c36e5b1  providers/implementations/macs/gmac_prov.c
 4d1d73b64f9fd1473a4b70c92fae2ad87aa30b6ec6d946d408deb251c0ef70c1  providers/implementations/macs/hmac_prov.c
 aa7ba1d39ea4e3347294eb50b4dfcb895ef1a22bd6117d3b076a74e9ff11c242  providers/implementations/macs/kmac_prov.c
diff --git a/providers/fips.checksum b/providers/fips.checksum
index c7e944675c..c712c1c4ea 100644
--- a/providers/fips.checksum
+++ b/providers/fips.checksum
@@ -1 +1 @@
-a063a464981d8b2f8b76cd521f3f902d56bf8d591bbd06c408470a6d10b81417  providers/fips-sources.checksums
+ef592dcb3367315f78795c64d131ca9ff062d1f6ca8702e1eef4b417e9b336a2  providers/fips-sources.checksums
diff --git a/providers/fips.module.sources b/providers/fips.module.sources
index 15346f9307..be4fc0de8f 100644
--- a/providers/fips.module.sources
+++ b/providers/fips.module.sources
@@ -392,8 +392,6 @@ include/openssl/aes.h
 include/openssl/asn1.h.in
 include/openssl/asn1err.h
 include/openssl/asn1t.h.in
-include/openssl/async.h
-include/openssl/asyncerr.h
 include/openssl/bio.h.in
 include/openssl/bioerr.h
 include/openssl/bn.h
@@ -401,8 +399,6 @@ include/openssl/bnerr.h
 include/openssl/buffer.h
 include/openssl/buffererr.h
 include/openssl/cmac.h
-include/openssl/comp.h
-include/openssl/comperr.h
 include/openssl/conf.h.in
 include/openssl/conferr.h
 include/openssl/configuration.h.in
@@ -413,14 +409,11 @@ include/openssl/core_names.h
 include/openssl/crypto.h.in
 include/openssl/cryptoerr.h
 include/openssl/cryptoerr_legacy.h
-include/openssl/ct.h.in
-include/openssl/cterr.h
 include/openssl/des.h
 include/openssl/dh.h
 include/openssl/dherr.h
 include/openssl/dsa.h
 include/openssl/dsaerr.h
-include/openssl/dtls1.h
 include/openssl/e_os2.h
 include/openssl/ebcdic.h
 include/openssl/ec.h
@@ -456,6 +449,7 @@ include/openssl/pem.h
 include/openssl/pemerr.h
 include/openssl/pkcs7.h.in
 include/openssl/pkcs7err.h
+include/openssl/prov_ssl.h
 include/openssl/proverr.h
 include/openssl/provider.h
 include/openssl/rand.h
@@ -466,15 +460,8 @@ include/openssl/rsaerr.h
 include/openssl/safestack.h.in
 include/openssl/self_test.h
 include/openssl/sha.h
-include/openssl/srtp.h
-include/openssl/ssl.h.in
-include/openssl/ssl2.h
-include/openssl/ssl3.h
-include/openssl/sslerr.h
-include/openssl/sslerr_legacy.h
 include/openssl/stack.h
 include/openssl/symhacks.h
-include/openssl/tls1.h
 include/openssl/trace.h
 include/openssl/types.h
 include/openssl/ui.h.in
diff --git a/providers/implementations/asymciphers/rsa_enc.c b/providers/implementations/asymciphers/rsa_enc.c
index 7b534e76ed..ce5ddff651 100644
--- a/providers/implementations/asymciphers/rsa_enc.c
+++ b/providers/implementations/asymciphers/rsa_enc.c
@@ -22,7 +22,7 @@
 #include <openssl/err.h>
 #include <openssl/proverr.h>
 /* Just for SSL_MAX_MASTER_KEY_LENGTH */
-#include <openssl/ssl.h>
+#include <openssl/prov_ssl.h>
 #include "internal/constant_time.h"
 #include "internal/sizes.h"
 #include "crypto/rsa.h"
diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
index a0eef7c1e5..f9a8a58041 100644
--- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
+++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c
@@ -16,8 +16,8 @@
 
 /* Dispatch functions for AES_CBC_HMAC_SHA ciphers */
 
-/* Only for SSL3_VERSION and TLS1_VERSION */
-#include <openssl/ssl.h>
+/* For SSL3_VERSION and TLS1_VERSION */
+#include <openssl/prov_ssl.h>
 #include <openssl/proverr.h>
 #include "cipher_aes_cbc_hmac_sha.h"
 #include "prov/implementations.h"
diff --git a/providers/implementations/ciphers/ciphercommon.c b/providers/implementations/ciphers/ciphercommon.c
index 3c8ea8c03c..b5a0d43b78 100644
--- a/providers/implementations/ciphers/ciphercommon.c
+++ b/providers/implementations/ciphers/ciphercommon.c
@@ -12,7 +12,7 @@
  */
 
 /* For SSL3_VERSION */
-#include <openssl/ssl.h>
+#include <openssl/prov_ssl.h>
 #include <openssl/proverr.h>
 #include "ciphercommon_local.h"
 #include "prov/provider_ctx.h"
diff --git a/providers/implementations/ciphers/ciphercommon_block.c b/providers/implementations/ciphers/ciphercommon_block.c
index 14f7503b36..6e6bb091e7 100644
--- a/providers/implementations/ciphers/ciphercommon_block.c
+++ b/providers/implementations/ciphers/ciphercommon_block.c
@@ -9,7 +9,7 @@
 
 #include <assert.h>
 /* For SSL3_VERSION, TLS1_VERSION etc */
-#include <openssl/ssl.h>
+#include <openssl/prov_ssl.h>
 #include <openssl/rand.h>
 #include <openssl/proverr.h>
 #include "internal/constant_time.h"


More information about the openssl-commits mailing list