From 2c207210369234bf50cf6602c208bc40692935f4f4e8478249bea4bf50a87772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=C4=9Bzslav=20=C4=8C=C3=AD=C5=BEek?=
 <vcizek@suse.com>
Date: Tue, 14 Aug 2018 14:30:53 +0000
Subject: [PATCH] add ;

OBS-URL: https://build.opensuse.org/package/show/security:tls/openssl-1_1?expand=0&rev=18
---
 openssl-1.1.0-fips.patch | 280 +++++++++++++++++++--------------------
 1 file changed, 140 insertions(+), 140 deletions(-)

diff --git a/openssl-1.1.0-fips.patch b/openssl-1.1.0-fips.patch
index 36f8729..0ce2b5c 100644
--- a/openssl-1.1.0-fips.patch
+++ b/openssl-1.1.0-fips.patch
@@ -1,13 +1,13 @@
 Index: openssl-1.1.0i/apps/speed.c
 ===================================================================
---- openssl-1.1.0i.orig/apps/speed.c	2018-08-14 15:40:06.867060840 +0200
-+++ openssl-1.1.0i/apps/speed.c	2018-08-14 15:48:35.006317508 +0200
+--- openssl-1.1.0i.orig/apps/speed.c	2018-08-14 14:45:06.000000000 +0200
++++ openssl-1.1.0i/apps/speed.c	2018-08-14 16:26:07.621049982 +0200
 @@ -1467,6 +1467,8 @@ int speed_main(int argc, char **argv)
          if (strcmp(*argv, "rsa") == 0) {
              for (loop = 0; loop < OSSL_NELEM(rsa_doit); loop++)
                  rsa_doit[loop] = 1;
 +            if (FIPS_mode())
-+                rsa_doit[R_RSA_512] = 0
++                rsa_doit[R_RSA_512] = 0;
              continue;
          }
          if (found(*argv, rsa_choices, &i)) {
@@ -114,8 +114,8 @@ Index: openssl-1.1.0i/apps/speed.c
                  exit(1);
 Index: openssl-1.1.0i/Configure
 ===================================================================
---- openssl-1.1.0i.orig/Configure	2018-08-14 15:40:06.867060840 +0200
-+++ openssl-1.1.0i/Configure	2018-08-14 15:40:13.639103807 +0200
+--- openssl-1.1.0i.orig/Configure	2018-08-14 16:25:03.984628260 +0200
++++ openssl-1.1.0i/Configure	2018-08-14 16:25:04.100629029 +0200
 @@ -313,7 +313,7 @@ $config{sdirs} = [
      "md2", "md4", "md5", "sha", "mdc2", "hmac", "ripemd", "whrlpool", "poly1305", "blake2",
      "des", "aes", "rc2", "rc4", "rc5", "idea", "bf", "cast", "camellia", "seed", "chacha", "modes",
@@ -127,8 +127,8 @@ Index: openssl-1.1.0i/Configure
      ];
 Index: openssl-1.1.0i/crypto/bn/bn_rand.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/bn/bn_rand.c	2018-08-14 15:40:06.867060840 +0200
-+++ openssl-1.1.0i/crypto/bn/bn_rand.c	2018-08-14 15:40:13.639103807 +0200
+--- openssl-1.1.0i.orig/crypto/bn/bn_rand.c	2018-08-14 14:45:06.000000000 +0200
++++ openssl-1.1.0i/crypto/bn/bn_rand.c	2018-08-14 16:25:04.100629029 +0200
 @@ -39,9 +39,11 @@ static int bnrand(int pseudorand, BIGNUM
          goto err;
      }
@@ -146,8 +146,8 @@ Index: openssl-1.1.0i/crypto/bn/bn_rand.c
          goto err;
 Index: openssl-1.1.0i/crypto/dh/dh_err.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/dh/dh_err.c	2018-08-14 15:40:06.867060840 +0200
-+++ openssl-1.1.0i/crypto/dh/dh_err.c	2018-08-14 15:40:13.639103807 +0200
+--- openssl-1.1.0i.orig/crypto/dh/dh_err.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/dh/dh_err.c	2018-08-14 16:25:04.100629029 +0200
 @@ -25,6 +25,9 @@ static ERR_STRING_DATA DH_str_functs[] =
      {ERR_FUNC(DH_F_DH_CMS_DECRYPT), "dh_cms_decrypt"},
      {ERR_FUNC(DH_F_DH_CMS_SET_PEERKEY), "dh_cms_set_peerkey"},
@@ -172,8 +172,8 @@ Index: openssl-1.1.0i/crypto/dh/dh_err.c
      {ERR_REASON(DH_R_SHARED_INFO_ERROR), "shared info error"},
 Index: openssl-1.1.0i/crypto/dh/dh_gen.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/dh/dh_gen.c	2018-08-14 15:40:06.867060840 +0200
-+++ openssl-1.1.0i/crypto/dh/dh_gen.c	2018-08-14 15:40:13.639103807 +0200
+--- openssl-1.1.0i.orig/crypto/dh/dh_gen.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/dh/dh_gen.c	2018-08-14 16:25:04.100629029 +0200
 @@ -16,6 +16,9 @@
  #include "internal/cryptlib.h"
  #include <openssl/bn.h>
@@ -219,8 +219,8 @@ Index: openssl-1.1.0i/crypto/dh/dh_gen.c
          goto err;
 Index: openssl-1.1.0i/crypto/dh/dh_key.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/dh/dh_key.c	2018-08-14 15:40:06.867060840 +0200
-+++ openssl-1.1.0i/crypto/dh/dh_key.c	2018-08-14 15:40:13.639103807 +0200
+--- openssl-1.1.0i.orig/crypto/dh/dh_key.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/dh/dh_key.c	2018-08-14 16:25:04.100629029 +0200
 @@ -11,6 +11,9 @@
  #include "internal/cryptlib.h"
  #include "dh_locl.h"
@@ -306,8 +306,8 @@ Index: openssl-1.1.0i/crypto/dh/dh_key.c
  }
 Index: openssl-1.1.0i/crypto/dsa/dsa_err.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/dsa/dsa_err.c	2018-08-14 15:40:06.867060840 +0200
-+++ openssl-1.1.0i/crypto/dsa/dsa_err.c	2018-08-14 15:40:13.643103832 +0200
+--- openssl-1.1.0i.orig/crypto/dsa/dsa_err.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/dsa/dsa_err.c	2018-08-14 16:25:04.100629029 +0200
 @@ -21,10 +21,13 @@
  static ERR_STRING_DATA DSA_str_functs[] = {
      {ERR_FUNC(DSA_F_DSAPARAMS_PRINT), "DSAparams_print"},
@@ -338,7 +338,7 @@ Index: openssl-1.1.0i/crypto/dsa/dsa_err.c
 Index: openssl-1.1.0i/crypto/dsa/dsa_gen.c
 ===================================================================
 --- openssl-1.1.0i.orig/crypto/dsa/dsa_gen.c	2018-08-14 14:45:07.000000000 +0200
-+++ openssl-1.1.0i/crypto/dsa/dsa_gen.c	2018-08-14 15:40:13.643103832 +0200
++++ openssl-1.1.0i/crypto/dsa/dsa_gen.c	2018-08-14 16:25:04.100629029 +0200
 @@ -22,12 +22,22 @@
  #include <openssl/rand.h>
  #include <openssl/sha.h>
@@ -502,8 +502,8 @@ Index: openssl-1.1.0i/crypto/dsa/dsa_gen.c
 +#endif
 Index: openssl-1.1.0i/crypto/dsa/dsa_key.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/dsa/dsa_key.c	2018-08-14 15:40:06.867060840 +0200
-+++ openssl-1.1.0i/crypto/dsa/dsa_key.c	2018-08-14 15:40:13.643103832 +0200
+--- openssl-1.1.0i.orig/crypto/dsa/dsa_key.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/dsa/dsa_key.c	2018-08-14 16:25:04.100629029 +0200
 @@ -13,10 +13,49 @@
  #include <openssl/bn.h>
  #include "dsa_locl.h"
@@ -585,8 +585,8 @@ Index: openssl-1.1.0i/crypto/dsa/dsa_key.c
   err:
 Index: openssl-1.1.0i/crypto/dsa/dsa_ossl.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/dsa/dsa_ossl.c	2018-08-14 15:40:06.871060864 +0200
-+++ openssl-1.1.0i/crypto/dsa/dsa_ossl.c	2018-08-14 15:41:08.719453286 +0200
+--- openssl-1.1.0i.orig/crypto/dsa/dsa_ossl.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/dsa/dsa_ossl.c	2018-08-14 16:25:04.100629029 +0200
 @@ -15,6 +15,9 @@
  #include <openssl/sha.h>
  #include "dsa_locl.h"
@@ -648,8 +648,8 @@ Index: openssl-1.1.0i/crypto/dsa/dsa_ossl.c
  }
 Index: openssl-1.1.0i/crypto/dsa/dsa_pmeth.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/dsa/dsa_pmeth.c	2018-08-14 15:40:06.871060864 +0200
-+++ openssl-1.1.0i/crypto/dsa/dsa_pmeth.c	2018-08-14 15:40:13.643103832 +0200
+--- openssl-1.1.0i.orig/crypto/dsa/dsa_pmeth.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/dsa/dsa_pmeth.c	2018-08-14 16:25:04.100629029 +0200
 @@ -208,8 +208,8 @@ static int pkey_dsa_paramgen(EVP_PKEY_CT
          BN_GENCB_free(pcb);
          return 0;
@@ -663,8 +663,8 @@ Index: openssl-1.1.0i/crypto/dsa/dsa_pmeth.c
          EVP_PKEY_assign_DSA(pkey, dsa);
 Index: openssl-1.1.0i/crypto/ec/ecdh_ossl.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/ec/ecdh_ossl.c	2018-08-14 15:40:06.871060864 +0200
-+++ openssl-1.1.0i/crypto/ec/ecdh_ossl.c	2018-08-14 15:40:13.643103832 +0200
+--- openssl-1.1.0i.orig/crypto/ec/ecdh_ossl.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/ec/ecdh_ossl.c	2018-08-14 16:25:04.100629029 +0200
 @@ -33,9 +33,20 @@
  #include <openssl/ec.h>
  #include "ec_lcl.h"
@@ -688,8 +688,8 @@ Index: openssl-1.1.0i/crypto/ec/ecdh_ossl.c
          return 0;
 Index: openssl-1.1.0i/crypto/ec/ecdsa_ossl.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/ec/ecdsa_ossl.c	2018-08-14 15:40:06.871060864 +0200
-+++ openssl-1.1.0i/crypto/ec/ecdsa_ossl.c	2018-08-14 15:40:13.643103832 +0200
+--- openssl-1.1.0i.orig/crypto/ec/ecdsa_ossl.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/ec/ecdsa_ossl.c	2018-08-14 16:25:04.100629029 +0200
 @@ -14,6 +14,10 @@
  #include "internal/bn_int.h"
  #include "ec_lcl.h"
@@ -731,8 +731,8 @@ Index: openssl-1.1.0i/crypto/ec/ecdsa_ossl.c
          (pub_key = EC_KEY_get0_public_key(eckey)) == NULL || sig == NULL) {
 Index: openssl-1.1.0i/crypto/ec/ec_key.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/ec/ec_key.c	2018-08-14 15:40:06.871060864 +0200
-+++ openssl-1.1.0i/crypto/ec/ec_key.c	2018-08-14 15:40:13.643103832 +0200
+--- openssl-1.1.0i.orig/crypto/ec/ec_key.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/ec/ec_key.c	2018-08-14 16:25:04.100629029 +0200
 @@ -177,14 +177,61 @@ int EC_KEY_up_ref(EC_KEY *r)
      return ((i > 1) ? 1 : 0);
  }
@@ -799,8 +799,8 @@ Index: openssl-1.1.0i/crypto/ec/ec_key.c
  }
 Index: openssl-1.1.0i/crypto/err/err_all.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/err/err_all.c	2018-08-14 15:40:06.871060864 +0200
-+++ openssl-1.1.0i/crypto/err/err_all.c	2018-08-14 15:40:13.643103832 +0200
+--- openssl-1.1.0i.orig/crypto/err/err_all.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/err/err_all.c	2018-08-14 16:25:04.100629029 +0200
 @@ -43,9 +43,6 @@
  int err_load_crypto_strings_int(void)
  {
@@ -813,8 +813,8 @@ Index: openssl-1.1.0i/crypto/err/err_all.c
          ERR_load_BN_strings() == 0 ||
 Index: openssl-1.1.0i/crypto/evp/c_allc.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/evp/c_allc.c	2018-08-14 15:40:06.871060864 +0200
-+++ openssl-1.1.0i/crypto/evp/c_allc.c	2018-08-14 15:40:13.643103832 +0200
+--- openssl-1.1.0i.orig/crypto/evp/c_allc.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/evp/c_allc.c	2018-08-14 16:25:04.100629029 +0200
 @@ -17,6 +17,9 @@
  void openssl_add_all_ciphers_int(void)
  {
@@ -898,8 +898,8 @@ Index: openssl-1.1.0i/crypto/evp/c_allc.c
  }
 Index: openssl-1.1.0i/crypto/evp/c_alld.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/evp/c_alld.c	2018-08-14 15:40:06.871060864 +0200
-+++ openssl-1.1.0i/crypto/evp/c_alld.c	2018-08-14 15:40:13.643103832 +0200
+--- openssl-1.1.0i.orig/crypto/evp/c_alld.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/evp/c_alld.c	2018-08-14 16:25:04.100629029 +0200
 @@ -16,6 +16,9 @@
  
  void openssl_add_all_digests_int(void)
@@ -928,8 +928,8 @@ Index: openssl-1.1.0i/crypto/evp/c_alld.c
  }
 Index: openssl-1.1.0i/crypto/evp/digest.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/evp/digest.c	2018-08-14 15:40:06.871060864 +0200
-+++ openssl-1.1.0i/crypto/evp/digest.c	2018-08-14 15:40:13.643103832 +0200
+--- openssl-1.1.0i.orig/crypto/evp/digest.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/evp/digest.c	2018-08-14 16:25:04.100629029 +0200
 @@ -14,6 +14,9 @@
  #include <openssl/engine.h>
  #include "internal/evp_int.h"
@@ -991,8 +991,8 @@ Index: openssl-1.1.0i/crypto/evp/digest.c
      if (size != NULL)
 Index: openssl-1.1.0i/crypto/evp/e_aes.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/evp/e_aes.c	2018-08-14 15:40:06.871060864 +0200
-+++ openssl-1.1.0i/crypto/evp/e_aes.c	2018-08-14 15:40:13.647103858 +0200
+--- openssl-1.1.0i.orig/crypto/evp/e_aes.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/evp/e_aes.c	2018-08-14 16:25:42.788885420 +0200
 @@ -1263,9 +1263,9 @@ static int aes_ctr_cipher(EVP_CIPHER_CTX
      return 1;
  }
@@ -1090,8 +1090,8 @@ Index: openssl-1.1.0i/crypto/evp/e_aes.c
  
 Index: openssl-1.1.0i/crypto/evp/e_des3.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/evp/e_des3.c	2018-08-14 15:40:06.871060864 +0200
-+++ openssl-1.1.0i/crypto/evp/e_des3.c	2018-08-14 15:40:13.647103858 +0200
+--- openssl-1.1.0i.orig/crypto/evp/e_des3.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/evp/e_des3.c	2018-08-14 16:25:04.104629056 +0200
 @@ -211,16 +211,19 @@ BLOCK_CIPHER_defs(des_ede, DES_EDE_KEY,
  # define des_ede3_cbc_cipher des_ede_cbc_cipher
  # define des_ede3_ecb_cipher des_ede_ecb_cipher
@@ -1120,8 +1120,8 @@ Index: openssl-1.1.0i/crypto/evp/e_des3.c
                              const unsigned char *iv, int enc)
 Index: openssl-1.1.0i/crypto/evp/e_null.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/evp/e_null.c	2018-08-14 15:40:06.871060864 +0200
-+++ openssl-1.1.0i/crypto/evp/e_null.c	2018-08-14 15:40:13.647103858 +0200
+--- openssl-1.1.0i.orig/crypto/evp/e_null.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/evp/e_null.c	2018-08-14 16:25:04.104629056 +0200
 @@ -19,7 +19,8 @@ static int null_cipher(EVP_CIPHER_CTX *c
                         const unsigned char *in, size_t inl);
  static const EVP_CIPHER n_cipher = {
@@ -1134,8 +1134,8 @@ Index: openssl-1.1.0i/crypto/evp/e_null.c
      NULL,
 Index: openssl-1.1.0i/crypto/evp/evp_enc.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/evp/evp_enc.c	2018-08-14 15:40:06.871060864 +0200
-+++ openssl-1.1.0i/crypto/evp/evp_enc.c	2018-08-14 15:40:13.647103858 +0200
+--- openssl-1.1.0i.orig/crypto/evp/evp_enc.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/evp/evp_enc.c	2018-08-14 16:25:04.104629056 +0200
 @@ -16,10 +16,19 @@
  #include <openssl/engine.h>
  #include "internal/evp_int.h"
@@ -1213,8 +1213,8 @@ Index: openssl-1.1.0i/crypto/evp/evp_enc.c
          if (!ctx->cipher->init(ctx, key, iv, enc))
 Index: openssl-1.1.0i/crypto/evp/evp_err.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/evp/evp_err.c	2018-08-14 15:40:06.875060891 +0200
-+++ openssl-1.1.0i/crypto/evp/evp_err.c	2018-08-14 15:40:13.647103858 +0200
+--- openssl-1.1.0i.orig/crypto/evp/evp_err.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/evp/evp_err.c	2018-08-14 16:25:04.104629056 +0200
 @@ -24,6 +24,7 @@ static ERR_STRING_DATA EVP_str_functs[]
      {ERR_FUNC(EVP_F_AES_OCB_CIPHER), "aes_ocb_cipher"},
      {ERR_FUNC(EVP_F_AES_T4_INIT_KEY), "aes_t4_init_key"},
@@ -1241,8 +1241,8 @@ Index: openssl-1.1.0i/crypto/evp/evp_err.c
      {ERR_REASON(EVP_R_UNKNOWN_OPTION), "unknown option"},
 Index: openssl-1.1.0i/crypto/evp/evp_lib.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/evp/evp_lib.c	2018-08-14 15:40:06.875060891 +0200
-+++ openssl-1.1.0i/crypto/evp/evp_lib.c	2018-08-14 15:40:13.647103858 +0200
+--- openssl-1.1.0i.orig/crypto/evp/evp_lib.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/evp/evp_lib.c	2018-08-14 16:25:04.104629056 +0200
 @@ -180,6 +180,9 @@ int EVP_CIPHER_impl_ctx_size(const EVP_C
  int EVP_Cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                 const unsigned char *in, unsigned int inl)
@@ -1255,8 +1255,8 @@ Index: openssl-1.1.0i/crypto/evp/evp_lib.c
  
 Index: openssl-1.1.0i/crypto/evp/m_sha1.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/evp/m_sha1.c	2018-08-14 15:40:06.875060891 +0200
-+++ openssl-1.1.0i/crypto/evp/m_sha1.c	2018-08-14 15:40:13.647103858 +0200
+--- openssl-1.1.0i.orig/crypto/evp/m_sha1.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/evp/m_sha1.c	2018-08-14 16:25:04.104629056 +0200
 @@ -94,7 +94,7 @@ static const EVP_MD sha1_md = {
      NID_sha1,
      NID_sha1WithRSAEncryption,
@@ -1305,7 +1305,7 @@ Index: openssl-1.1.0i/crypto/evp/m_sha1.c
 Index: openssl-1.1.0i/crypto/fips/build.info
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/build.info	2018-08-14 15:40:13.647103858 +0200
++++ openssl-1.1.0i/crypto/fips/build.info	2018-08-14 16:25:04.104629056 +0200
 @@ -0,0 +1,15 @@
 +LIBS=../../libcrypto
 +SOURCE[../../libcrypto]=\
@@ -1325,7 +1325,7 @@ Index: openssl-1.1.0i/crypto/fips/build.info
 Index: openssl-1.1.0i/crypto/fips/fips_aes_selftest.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_aes_selftest.c	2018-08-14 15:40:13.647103858 +0200
++++ openssl-1.1.0i/crypto/fips/fips_aes_selftest.c	2018-08-14 16:25:04.104629056 +0200
 @@ -0,0 +1,372 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -1702,7 +1702,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_aes_selftest.c
 Index: openssl-1.1.0i/crypto/fips/fips.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips.c	2018-08-14 15:40:13.647103858 +0200
++++ openssl-1.1.0i/crypto/fips/fips.c	2018-08-14 16:25:43.616890905 +0200
 @@ -0,0 +1,526 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -2233,7 +2233,7 @@ Index: openssl-1.1.0i/crypto/fips/fips.c
 Index: openssl-1.1.0i/crypto/fips/fips_cmac_selftest.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_cmac_selftest.c	2018-08-14 15:40:13.647103858 +0200
++++ openssl-1.1.0i/crypto/fips/fips_cmac_selftest.c	2018-08-14 16:25:04.104629056 +0200
 @@ -0,0 +1,156 @@
 +/* ====================================================================
 + * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
@@ -2394,7 +2394,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_cmac_selftest.c
 Index: openssl-1.1.0i/crypto/fips/fips_des_selftest.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_des_selftest.c	2018-08-14 15:40:13.647103858 +0200
++++ openssl-1.1.0i/crypto/fips/fips_des_selftest.c	2018-08-14 16:25:04.104629056 +0200
 @@ -0,0 +1,133 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -2532,7 +2532,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_des_selftest.c
 Index: openssl-1.1.0i/crypto/fips/fips_dh_selftest.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_dh_selftest.c	2018-08-14 15:40:13.647103858 +0200
++++ openssl-1.1.0i/crypto/fips/fips_dh_selftest.c	2018-08-14 16:25:04.104629056 +0200
 @@ -0,0 +1,180 @@
 +/* ====================================================================
 + * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
@@ -2717,7 +2717,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_dh_selftest.c
 Index: openssl-1.1.0i/crypto/fips/fips_drbg_ctr.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_drbg_ctr.c	2018-08-14 15:40:13.647103858 +0200
++++ openssl-1.1.0i/crypto/fips/fips_drbg_ctr.c	2018-08-14 16:25:04.104629056 +0200
 @@ -0,0 +1,415 @@
 +/* fips/rand/fips_drbg_ctr.c */
 +/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -3137,7 +3137,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_drbg_ctr.c
 Index: openssl-1.1.0i/crypto/fips/fips_drbg_hash.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_drbg_hash.c	2018-08-14 15:40:13.647103858 +0200
++++ openssl-1.1.0i/crypto/fips/fips_drbg_hash.c	2018-08-14 16:25:04.104629056 +0200
 @@ -0,0 +1,361 @@
 +/* fips/rand/fips_drbg_hash.c */
 +/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -3503,7 +3503,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_drbg_hash.c
 Index: openssl-1.1.0i/crypto/fips/fips_drbg_hmac.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_drbg_hmac.c	2018-08-14 15:40:13.647103858 +0200
++++ openssl-1.1.0i/crypto/fips/fips_drbg_hmac.c	2018-08-14 16:25:04.104629056 +0200
 @@ -0,0 +1,272 @@
 +/* fips/rand/fips_drbg_hmac.c */
 +/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -3780,7 +3780,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_drbg_hmac.c
 Index: openssl-1.1.0i/crypto/fips/fips_drbg_lib.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_drbg_lib.c	2018-08-14 15:40:13.647103858 +0200
++++ openssl-1.1.0i/crypto/fips/fips_drbg_lib.c	2018-08-14 16:25:04.104629056 +0200
 @@ -0,0 +1,555 @@
 +/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
 + * project.
@@ -4340,7 +4340,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_drbg_lib.c
 Index: openssl-1.1.0i/crypto/fips/fips_drbg_rand.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_drbg_rand.c	2018-08-14 15:40:13.647103858 +0200
++++ openssl-1.1.0i/crypto/fips/fips_drbg_rand.c	2018-08-14 16:25:43.804892153 +0200
 @@ -0,0 +1,183 @@
 +/* fips/rand/fips_drbg_rand.c */
 +/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -4528,7 +4528,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_drbg_rand.c
 Index: openssl-1.1.0i/crypto/fips/fips_drbg_selftest.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_drbg_selftest.c	2018-08-14 15:40:13.647103858 +0200
++++ openssl-1.1.0i/crypto/fips/fips_drbg_selftest.c	2018-08-14 16:25:04.104629056 +0200
 @@ -0,0 +1,828 @@
 +/* fips/rand/fips_drbg_selftest.c */
 +/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -5361,7 +5361,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_drbg_selftest.c
 Index: openssl-1.1.0i/crypto/fips/fips_drbg_selftest.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_drbg_selftest.h	2018-08-14 15:40:13.647103858 +0200
++++ openssl-1.1.0i/crypto/fips/fips_drbg_selftest.h	2018-08-14 16:25:04.108629081 +0200
 @@ -0,0 +1,1791 @@
 +/* ====================================================================
 + * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
@@ -7157,7 +7157,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_drbg_selftest.h
 Index: openssl-1.1.0i/crypto/fips/fips_dsa_selftest.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_dsa_selftest.c	2018-08-14 15:40:13.655103909 +0200
++++ openssl-1.1.0i/crypto/fips/fips_dsa_selftest.c	2018-08-14 16:25:04.128629214 +0200
 @@ -0,0 +1,195 @@
 +/* ====================================================================
 + * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
@@ -7357,7 +7357,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_dsa_selftest.c
 Index: openssl-1.1.0i/crypto/fips/fips_ecdh_selftest.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_ecdh_selftest.c	2018-08-14 15:40:13.655103909 +0200
++++ openssl-1.1.0i/crypto/fips/fips_ecdh_selftest.c	2018-08-14 16:25:04.128629214 +0200
 @@ -0,0 +1,242 @@
 +/* fips/ecdh/fips_ecdh_selftest.c */
 +/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -7604,7 +7604,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_ecdh_selftest.c
 Index: openssl-1.1.0i/crypto/fips/fips_ecdsa_selftest.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_ecdsa_selftest.c	2018-08-14 15:40:13.655103909 +0200
++++ openssl-1.1.0i/crypto/fips/fips_ecdsa_selftest.c	2018-08-14 16:25:04.128629214 +0200
 @@ -0,0 +1,166 @@
 +/* fips/ecdsa/fips_ecdsa_selftest.c */
 +/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -7775,7 +7775,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_ecdsa_selftest.c
 Index: openssl-1.1.0i/crypto/fips/fips_enc.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_enc.c	2018-08-14 15:40:13.655103909 +0200
++++ openssl-1.1.0i/crypto/fips/fips_enc.c	2018-08-14 16:25:04.128629214 +0200
 @@ -0,0 +1,189 @@
 +/* fipe/evp/fips_enc.c */
 +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
@@ -7969,7 +7969,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_enc.c
 Index: openssl-1.1.0i/crypto/fips/fips_err.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_err.h	2018-08-14 15:40:13.655103909 +0200
++++ openssl-1.1.0i/crypto/fips/fips_err.h	2018-08-14 16:25:04.128629214 +0200
 @@ -0,0 +1,196 @@
 +/* crypto/fips_err.h */
 +/* ====================================================================
@@ -8170,7 +8170,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_err.h
 Index: openssl-1.1.0i/crypto/fips/fips_ers.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_ers.c	2018-08-14 15:40:13.655103909 +0200
++++ openssl-1.1.0i/crypto/fips/fips_ers.c	2018-08-14 16:25:04.128629214 +0200
 @@ -0,0 +1,7 @@
 +#include <openssl/opensslconf.h>
 +
@@ -8182,7 +8182,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_ers.c
 Index: openssl-1.1.0i/crypto/fips/fips_hmac_selftest.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_hmac_selftest.c	2018-08-14 15:40:13.655103909 +0200
++++ openssl-1.1.0i/crypto/fips/fips_hmac_selftest.c	2018-08-14 16:25:04.128629214 +0200
 @@ -0,0 +1,134 @@
 +/* ====================================================================
 + * Copyright (c) 2005 The OpenSSL Project.  All rights reserved.
@@ -8321,7 +8321,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_hmac_selftest.c
 Index: openssl-1.1.0i/crypto/fips/fips_locl.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_locl.h	2018-08-14 15:40:13.655103909 +0200
++++ openssl-1.1.0i/crypto/fips/fips_locl.h	2018-08-14 16:25:04.128629214 +0200
 @@ -0,0 +1,71 @@
 +/* ====================================================================
 + * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
@@ -8397,7 +8397,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_locl.h
 Index: openssl-1.1.0i/crypto/fips/fips_md.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_md.c	2018-08-14 15:40:13.655103909 +0200
++++ openssl-1.1.0i/crypto/fips/fips_md.c	2018-08-14 16:25:04.128629214 +0200
 @@ -0,0 +1,144 @@
 +/* fips/evp/fips_md.c */
 +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
@@ -8546,7 +8546,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_md.c
 Index: openssl-1.1.0i/crypto/fips/fips_post.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_post.c	2018-08-14 15:40:13.655103909 +0200
++++ openssl-1.1.0i/crypto/fips/fips_post.c	2018-08-14 16:25:04.128629214 +0200
 @@ -0,0 +1,222 @@
 +/* ====================================================================
 + * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
@@ -8773,7 +8773,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_post.c
 Index: openssl-1.1.0i/crypto/fips/fips_rand_lcl.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_rand_lcl.h	2018-08-14 15:40:13.655103909 +0200
++++ openssl-1.1.0i/crypto/fips/fips_rand_lcl.h	2018-08-14 16:25:04.132629242 +0200
 @@ -0,0 +1,209 @@
 +/* fips/rand/fips_rand_lcl.h */
 +/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
@@ -8987,7 +8987,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_rand_lcl.h
 Index: openssl-1.1.0i/crypto/fips/fips_rand_lib.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_rand_lib.c	2018-08-14 15:40:13.659103934 +0200
++++ openssl-1.1.0i/crypto/fips/fips_rand_lib.c	2018-08-14 16:25:04.132629242 +0200
 @@ -0,0 +1,234 @@
 +/* ====================================================================
 + * Copyright (c) 2011 The OpenSSL Project.  All rights reserved.
@@ -9226,7 +9226,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_rand_lib.c
 Index: openssl-1.1.0i/crypto/fips/fips_randtest.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_randtest.c	2018-08-14 15:40:13.659103934 +0200
++++ openssl-1.1.0i/crypto/fips/fips_randtest.c	2018-08-14 16:25:04.132629242 +0200
 @@ -0,0 +1,247 @@
 +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 + * All rights reserved.
@@ -9478,7 +9478,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_randtest.c
 Index: openssl-1.1.0i/crypto/fips/fips_rsa_selftest.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_rsa_selftest.c	2018-08-14 15:40:13.659103934 +0200
++++ openssl-1.1.0i/crypto/fips/fips_rsa_selftest.c	2018-08-14 16:25:04.132629242 +0200
 @@ -0,0 +1,578 @@
 +/* ====================================================================
 + * Copyright (c) 2003-2007 The OpenSSL Project.  All rights reserved.
@@ -10061,7 +10061,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_rsa_selftest.c
 Index: openssl-1.1.0i/crypto/fips/fips_sha_selftest.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_sha_selftest.c	2018-08-14 15:40:13.659103934 +0200
++++ openssl-1.1.0i/crypto/fips/fips_sha_selftest.c	2018-08-14 16:25:04.132629242 +0200
 @@ -0,0 +1,138 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -10204,7 +10204,7 @@ Index: openssl-1.1.0i/crypto/fips/fips_sha_selftest.c
 Index: openssl-1.1.0i/crypto/fips/fips_standalone_hmac.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/fips/fips_standalone_hmac.c	2018-08-14 15:40:13.659103934 +0200
++++ openssl-1.1.0i/crypto/fips/fips_standalone_hmac.c	2018-08-14 16:25:04.132629242 +0200
 @@ -0,0 +1,127 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -10335,8 +10335,8 @@ Index: openssl-1.1.0i/crypto/fips/fips_standalone_hmac.c
 +}
 Index: openssl-1.1.0i/crypto/hmac/hmac.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/hmac/hmac.c	2018-08-14 15:40:06.879060915 +0200
-+++ openssl-1.1.0i/crypto/hmac/hmac.c	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/hmac/hmac.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/hmac/hmac.c	2018-08-14 16:25:04.132629242 +0200
 @@ -35,6 +35,13 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const vo
      }
  
@@ -10354,7 +10354,7 @@ Index: openssl-1.1.0i/crypto/hmac/hmac.c
 Index: openssl-1.1.0i/crypto/include/internal/fips_int.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/crypto/include/internal/fips_int.h	2018-08-14 15:40:13.659103934 +0200
++++ openssl-1.1.0i/crypto/include/internal/fips_int.h	2018-08-14 16:25:04.132629242 +0200
 @@ -0,0 +1,101 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -10459,8 +10459,8 @@ Index: openssl-1.1.0i/crypto/include/internal/fips_int.h
 +#endif
 Index: openssl-1.1.0i/crypto/o_fips.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/o_fips.c	2018-08-14 15:40:06.879060915 +0200
-+++ openssl-1.1.0i/crypto/o_fips.c	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/o_fips.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/o_fips.c	2018-08-14 16:25:04.132629242 +0200
 @@ -9,7 +9,10 @@
  
  #include "internal/cryptlib.h"
@@ -10491,8 +10491,8 @@ Index: openssl-1.1.0i/crypto/o_fips.c
          return 1;
 Index: openssl-1.1.0i/crypto/o_init.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/o_init.c	2018-08-14 15:40:06.879060915 +0200
-+++ openssl-1.1.0i/crypto/o_init.c	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/o_init.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/o_init.c	2018-08-14 16:25:44.076893954 +0200
 @@ -7,11 +7,50 @@
   * https://www.openssl.org/source/license.html
   */
@@ -10581,8 +10581,8 @@ Index: openssl-1.1.0i/crypto/o_init.c
 +}
 Index: openssl-1.1.0i/crypto/rand/md_rand.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/rand/md_rand.c	2018-08-14 15:40:06.879060915 +0200
-+++ openssl-1.1.0i/crypto/rand/md_rand.c	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/rand/md_rand.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/rand/md_rand.c	2018-08-14 16:25:43.804892153 +0200
 @@ -360,7 +360,7 @@ static int rand_bytes(unsigned char *buf
      CRYPTO_THREAD_unlock(rand_tmp_lock);
      crypto_lock_rand = 1;
@@ -10594,8 +10594,8 @@ Index: openssl-1.1.0i/crypto/rand/md_rand.c
      }
 Index: openssl-1.1.0i/crypto/rand/rand_err.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/rand/rand_err.c	2018-08-14 15:40:06.879060915 +0200
-+++ openssl-1.1.0i/crypto/rand/rand_err.c	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/rand/rand_err.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/rand/rand_err.c	2018-08-14 16:25:04.132629242 +0200
 @@ -20,10 +20,13 @@
  
  static ERR_STRING_DATA RAND_str_functs[] = {
@@ -10612,8 +10612,8 @@ Index: openssl-1.1.0i/crypto/rand/rand_err.c
  };
 Index: openssl-1.1.0i/crypto/rand/rand_lcl.h
 ===================================================================
---- openssl-1.1.0i.orig/crypto/rand/rand_lcl.h	2018-08-14 15:40:06.879060915 +0200
-+++ openssl-1.1.0i/crypto/rand/rand_lcl.h	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/rand/rand_lcl.h	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/rand/rand_lcl.h	2018-08-14 16:25:04.132629242 +0200
 @@ -10,7 +10,7 @@
  #ifndef HEADER_RAND_LCL_H
  # define HEADER_RAND_LCL_H
@@ -10625,8 +10625,8 @@ Index: openssl-1.1.0i/crypto/rand/rand_lcl.h
  #  define USE_SHA1_RAND
 Index: openssl-1.1.0i/crypto/rand/rand_lib.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/rand/rand_lib.c	2018-08-14 15:40:06.879060915 +0200
-+++ openssl-1.1.0i/crypto/rand/rand_lib.c	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/rand/rand_lib.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/rand/rand_lib.c	2018-08-14 16:25:43.804892153 +0200
 @@ -18,6 +18,8 @@
  #ifdef OPENSSL_FIPS
  # include <openssl/fips.h>
@@ -10766,8 +10766,8 @@ Index: openssl-1.1.0i/crypto/rand/rand_lib.c
 +#endif
 Index: openssl-1.1.0i/crypto/rsa/rsa_crpt.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/rsa/rsa_crpt.c	2018-08-14 15:40:06.883060941 +0200
-+++ openssl-1.1.0i/crypto/rsa/rsa_crpt.c	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/rsa/rsa_crpt.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/rsa/rsa_crpt.c	2018-08-14 16:25:04.136629267 +0200
 @@ -28,24 +28,52 @@ int RSA_size(const RSA *r)
  int RSA_public_encrypt(int flen, const unsigned char *from, unsigned char *to,
                         RSA *rsa, int padding)
@@ -10823,8 +10823,8 @@ Index: openssl-1.1.0i/crypto/rsa/rsa_crpt.c
  
 Index: openssl-1.1.0i/crypto/rsa/rsa_err.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/rsa/rsa_err.c	2018-08-14 15:40:06.883060941 +0200
-+++ openssl-1.1.0i/crypto/rsa/rsa_err.c	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/rsa/rsa_err.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/rsa/rsa_err.c	2018-08-14 16:25:04.136629267 +0200
 @@ -21,6 +21,7 @@
  static ERR_STRING_DATA RSA_str_functs[] = {
      {ERR_FUNC(RSA_F_CHECK_PADDING_MD), "check_padding_md"},
@@ -10872,8 +10872,8 @@ Index: openssl-1.1.0i/crypto/rsa/rsa_err.c
      {ERR_REASON(RSA_R_PADDING_CHECK_FAILED), "padding check failed"},
 Index: openssl-1.1.0i/crypto/rsa/rsa_gen.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/rsa/rsa_gen.c	2018-08-14 15:40:06.883060941 +0200
-+++ openssl-1.1.0i/crypto/rsa/rsa_gen.c	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/rsa/rsa_gen.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/rsa/rsa_gen.c	2018-08-14 16:25:43.892892734 +0200
 @@ -18,6 +18,75 @@
  #include "internal/cryptlib.h"
  #include <openssl/bn.h>
@@ -11254,8 +11254,8 @@ Index: openssl-1.1.0i/crypto/rsa/rsa_gen.c
          goto err;
 Index: openssl-1.1.0i/crypto/rsa/rsa_lib.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/rsa/rsa_lib.c	2018-08-14 15:40:06.883060941 +0200
-+++ openssl-1.1.0i/crypto/rsa/rsa_lib.c	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/rsa/rsa_lib.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/rsa/rsa_lib.c	2018-08-14 16:25:04.136629267 +0200
 @@ -32,6 +32,12 @@ int RSA_set_method(RSA *rsa, const RSA_M
       * to deal with which ENGINE it comes from.
       */
@@ -11300,8 +11300,8 @@ Index: openssl-1.1.0i/crypto/rsa/rsa_lib.c
      }
 Index: openssl-1.1.0i/crypto/rsa/rsa_ossl.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/rsa/rsa_ossl.c	2018-08-14 15:40:06.883060941 +0200
-+++ openssl-1.1.0i/crypto/rsa/rsa_ossl.c	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/rsa/rsa_ossl.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/rsa/rsa_ossl.c	2018-08-14 16:25:04.136629267 +0200
 @@ -11,6 +11,10 @@
  #include "internal/bn_int.h"
  #include "rsa_locl.h"
@@ -11420,8 +11420,8 @@ Index: openssl-1.1.0i/crypto/rsa/rsa_ossl.c
          return -1;
 Index: openssl-1.1.0i/crypto/rsa/rsa_sign.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/rsa/rsa_sign.c	2018-08-14 15:40:06.883060941 +0200
-+++ openssl-1.1.0i/crypto/rsa/rsa_sign.c	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/rsa/rsa_sign.c	2018-08-14 14:45:07.000000000 +0200
++++ openssl-1.1.0i/crypto/rsa/rsa_sign.c	2018-08-14 16:25:04.136629267 +0200
 @@ -73,6 +73,13 @@ int RSA_sign(int type, const unsigned ch
      unsigned char *tmps = NULL;
      const unsigned char *encoded = NULL;
@@ -11450,8 +11450,8 @@ Index: openssl-1.1.0i/crypto/rsa/rsa_sign.c
  
 Index: openssl-1.1.0i/crypto/sha/sha_locl.h
 ===================================================================
---- openssl-1.1.0i.orig/crypto/sha/sha_locl.h	2018-08-14 15:40:06.883060941 +0200
-+++ openssl-1.1.0i/crypto/sha/sha_locl.h	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/sha/sha_locl.h	2018-08-14 14:45:08.000000000 +0200
++++ openssl-1.1.0i/crypto/sha/sha_locl.h	2018-08-14 16:25:04.136629267 +0200
 @@ -52,6 +52,9 @@ void sha1_block_data_order(SHA_CTX *c, c
  
  int HASH_INIT(SHA_CTX *c)
@@ -11464,8 +11464,8 @@ Index: openssl-1.1.0i/crypto/sha/sha_locl.h
      c->h1 = INIT_DATA_h1;
 Index: openssl-1.1.0i/crypto/sha/sha256.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/sha/sha256.c	2018-08-14 15:40:06.883060941 +0200
-+++ openssl-1.1.0i/crypto/sha/sha256.c	2018-08-14 15:40:13.659103934 +0200
+--- openssl-1.1.0i.orig/crypto/sha/sha256.c	2018-08-14 14:45:08.000000000 +0200
++++ openssl-1.1.0i/crypto/sha/sha256.c	2018-08-14 16:25:04.136629267 +0200
 @@ -18,6 +18,9 @@
  
  int SHA224_Init(SHA256_CTX *c)
@@ -11488,8 +11488,8 @@ Index: openssl-1.1.0i/crypto/sha/sha256.c
      c->h[1] = 0xbb67ae85UL;
 Index: openssl-1.1.0i/crypto/sha/sha512.c
 ===================================================================
---- openssl-1.1.0i.orig/crypto/sha/sha512.c	2018-08-14 15:40:06.883060941 +0200
-+++ openssl-1.1.0i/crypto/sha/sha512.c	2018-08-14 15:40:13.663103960 +0200
+--- openssl-1.1.0i.orig/crypto/sha/sha512.c	2018-08-14 14:45:08.000000000 +0200
++++ openssl-1.1.0i/crypto/sha/sha512.c	2018-08-14 16:25:04.136629267 +0200
 @@ -62,6 +62,9 @@
  
  int SHA384_Init(SHA512_CTX *c)
@@ -11512,8 +11512,8 @@ Index: openssl-1.1.0i/crypto/sha/sha512.c
      c->h[2] = U64(0x3c6ef372fe94f82b);
 Index: openssl-1.1.0i/doc/crypto/DSA_generate_parameters.pod
 ===================================================================
---- openssl-1.1.0i.orig/doc/crypto/DSA_generate_parameters.pod	2018-08-14 15:40:06.883060941 +0200
-+++ openssl-1.1.0i/doc/crypto/DSA_generate_parameters.pod	2018-08-14 15:40:13.663103960 +0200
+--- openssl-1.1.0i.orig/doc/crypto/DSA_generate_parameters.pod	2018-08-14 14:45:08.000000000 +0200
++++ openssl-1.1.0i/doc/crypto/DSA_generate_parameters.pod	2018-08-14 16:25:04.136629267 +0200
 @@ -29,8 +29,10 @@ B<bits> is the length of the prime p to
  For lengths under 2048 bits, the length of q is 160 bits; for lengths
  greater than or equal to 2048 bits, the length of q is set to 256 bits.
@@ -11529,8 +11529,8 @@ Index: openssl-1.1.0i/doc/crypto/DSA_generate_parameters.pod
  *B<counter_ret> and a counter used for finding a generator in
 Index: openssl-1.1.0i/include/openssl/crypto.h
 ===================================================================
---- openssl-1.1.0i.orig/include/openssl/crypto.h	2018-08-14 15:40:06.883060941 +0200
-+++ openssl-1.1.0i/include/openssl/crypto.h	2018-08-14 15:40:13.663103960 +0200
+--- openssl-1.1.0i.orig/include/openssl/crypto.h	2018-08-14 14:45:09.000000000 +0200
++++ openssl-1.1.0i/include/openssl/crypto.h	2018-08-14 16:25:04.136629267 +0200
 @@ -336,6 +336,11 @@ int OPENSSL_isservice(void);
  int FIPS_mode(void);
  int FIPS_mode_set(int r);
@@ -11545,8 +11545,8 @@ Index: openssl-1.1.0i/include/openssl/crypto.h
  struct tm *OPENSSL_gmtime(const time_t *timer, struct tm *result);
 Index: openssl-1.1.0i/include/openssl/dh.h
 ===================================================================
---- openssl-1.1.0i.orig/include/openssl/dh.h	2018-08-14 15:40:06.883060941 +0200
-+++ openssl-1.1.0i/include/openssl/dh.h	2018-08-14 15:40:13.663103960 +0200
+--- openssl-1.1.0i.orig/include/openssl/dh.h	2018-08-14 14:45:09.000000000 +0200
++++ openssl-1.1.0i/include/openssl/dh.h	2018-08-14 16:25:04.136629267 +0200
 @@ -30,6 +30,7 @@ extern "C" {
  # endif
  
@@ -11580,8 +11580,8 @@ Index: openssl-1.1.0i/include/openssl/dh.h
  # define DH_R_SHARED_INFO_ERROR                           113
 Index: openssl-1.1.0i/include/openssl/dsa.h
 ===================================================================
---- openssl-1.1.0i.orig/include/openssl/dsa.h	2018-08-14 15:40:06.883060941 +0200
-+++ openssl-1.1.0i/include/openssl/dsa.h	2018-08-14 15:40:13.663103960 +0200
+--- openssl-1.1.0i.orig/include/openssl/dsa.h	2018-08-14 14:45:09.000000000 +0200
++++ openssl-1.1.0i/include/openssl/dsa.h	2018-08-14 16:25:04.136629267 +0200
 @@ -36,6 +36,7 @@ extern "C" {
  # endif
  
@@ -11617,8 +11617,8 @@ Index: openssl-1.1.0i/include/openssl/dsa.h
  # define DSA_R_SEED_LEN_SMALL                             110
 Index: openssl-1.1.0i/include/openssl/evp.h
 ===================================================================
---- openssl-1.1.0i.orig/include/openssl/evp.h	2018-08-14 15:40:06.883060941 +0200
-+++ openssl-1.1.0i/include/openssl/evp.h	2018-08-14 15:40:13.663103960 +0200
+--- openssl-1.1.0i.orig/include/openssl/evp.h	2018-08-14 14:45:09.000000000 +0200
++++ openssl-1.1.0i/include/openssl/evp.h	2018-08-14 16:25:04.140629293 +0200
 @@ -1461,6 +1461,7 @@ int ERR_load_EVP_strings(void);
  # define EVP_F_AES_OCB_CIPHER                             169
  # define EVP_F_AES_T4_INIT_KEY                            178
@@ -11646,7 +11646,7 @@ Index: openssl-1.1.0i/include/openssl/evp.h
 Index: openssl-1.1.0i/include/openssl/fips.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/include/openssl/fips.h	2018-08-14 15:40:13.663103960 +0200
++++ openssl-1.1.0i/include/openssl/fips.h	2018-08-14 16:25:43.616890905 +0200
 @@ -0,0 +1,186 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -11837,7 +11837,7 @@ Index: openssl-1.1.0i/include/openssl/fips.h
 Index: openssl-1.1.0i/include/openssl/fips_rand.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ openssl-1.1.0i/include/openssl/fips_rand.h	2018-08-14 15:40:13.663103960 +0200
++++ openssl-1.1.0i/include/openssl/fips_rand.h	2018-08-14 16:25:04.140629293 +0200
 @@ -0,0 +1,145 @@
 +/* ====================================================================
 + * Copyright (c) 2003 The OpenSSL Project.  All rights reserved.
@@ -11986,8 +11986,8 @@ Index: openssl-1.1.0i/include/openssl/fips_rand.h
 +#endif
 Index: openssl-1.1.0i/include/openssl/opensslconf.h.in
 ===================================================================
---- openssl-1.1.0i.orig/include/openssl/opensslconf.h.in	2018-08-14 15:40:06.887060966 +0200
-+++ openssl-1.1.0i/include/openssl/opensslconf.h.in	2018-08-14 15:40:13.663103960 +0200
+--- openssl-1.1.0i.orig/include/openssl/opensslconf.h.in	2018-08-14 14:45:09.000000000 +0200
++++ openssl-1.1.0i/include/openssl/opensslconf.h.in	2018-08-14 16:25:04.140629293 +0200
 @@ -142,6 +142,11 @@ extern "C" {
  
  #define RC4_INT {- $config{rc4_int} -}
@@ -12002,8 +12002,8 @@ Index: openssl-1.1.0i/include/openssl/opensslconf.h.in
  #endif
 Index: openssl-1.1.0i/include/openssl/rand.h
 ===================================================================
---- openssl-1.1.0i.orig/include/openssl/rand.h	2018-08-14 15:40:06.887060966 +0200
-+++ openssl-1.1.0i/include/openssl/rand.h	2018-08-14 15:40:13.663103960 +0200
+--- openssl-1.1.0i.orig/include/openssl/rand.h	2018-08-14 14:45:09.000000000 +0200
++++ openssl-1.1.0i/include/openssl/rand.h	2018-08-14 16:25:04.140629293 +0200
 @@ -67,6 +67,11 @@ DEPRECATEDIN_1_1_0(void RAND_screen(void
  DEPRECATEDIN_1_1_0(int RAND_event(UINT, WPARAM, LPARAM))
  #endif
@@ -12030,8 +12030,8 @@ Index: openssl-1.1.0i/include/openssl/rand.h
  # ifdef  __cplusplus
 Index: openssl-1.1.0i/include/openssl/rsa.h
 ===================================================================
---- openssl-1.1.0i.orig/include/openssl/rsa.h	2018-08-14 15:40:06.887060966 +0200
-+++ openssl-1.1.0i/include/openssl/rsa.h	2018-08-14 15:40:13.663103960 +0200
+--- openssl-1.1.0i.orig/include/openssl/rsa.h	2018-08-14 14:45:09.000000000 +0200
++++ openssl-1.1.0i/include/openssl/rsa.h	2018-08-14 16:25:04.140629293 +0200
 @@ -463,6 +463,7 @@ int ERR_load_RSA_strings(void);
  /* Function codes. */
  # define RSA_F_CHECK_PADDING_MD                           140
@@ -12078,8 +12078,8 @@ Index: openssl-1.1.0i/include/openssl/rsa.h
  # define RSA_R_PKCS_DECODING_ERROR                        159
 Index: openssl-1.1.0i/ssl/ssl_ciph.c
 ===================================================================
---- openssl-1.1.0i.orig/ssl/ssl_ciph.c	2018-08-14 15:40:06.887060966 +0200
-+++ openssl-1.1.0i/ssl/ssl_ciph.c	2018-08-14 15:40:13.663103960 +0200
+--- openssl-1.1.0i.orig/ssl/ssl_ciph.c	2018-08-14 16:25:04.032628578 +0200
++++ openssl-1.1.0i/ssl/ssl_ciph.c	2018-08-14 16:25:04.140629293 +0200
 @@ -401,7 +401,8 @@ void ssl_load_ciphers(void)
          }
      }
@@ -12101,8 +12101,8 @@ Index: openssl-1.1.0i/ssl/ssl_ciph.c
              (c->algorithm_auth & disabled_auth) ||
 Index: openssl-1.1.0i/ssl/ssl_init.c
 ===================================================================
---- openssl-1.1.0i.orig/ssl/ssl_init.c	2018-08-14 15:40:06.887060966 +0200
-+++ openssl-1.1.0i/ssl/ssl_init.c	2018-08-14 15:40:13.663103960 +0200
+--- openssl-1.1.0i.orig/ssl/ssl_init.c	2018-08-14 14:45:09.000000000 +0200
++++ openssl-1.1.0i/ssl/ssl_init.c	2018-08-14 16:25:04.140629293 +0200
 @@ -29,6 +29,10 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_ssl_bas
      fprintf(stderr, "OPENSSL_INIT: ossl_init_ssl_base: "
              "Adding SSL ciphers and digests\n");
@@ -12148,8 +12148,8 @@ Index: openssl-1.1.0i/ssl/ssl_init.c
      fprintf(stderr, "OPENSSL_INIT: ossl_init_ssl_base: "
 Index: openssl-1.1.0i/ssl/ssl_lib.c
 ===================================================================
---- openssl-1.1.0i.orig/ssl/ssl_lib.c	2018-08-14 15:40:06.887060966 +0200
-+++ openssl-1.1.0i/ssl/ssl_lib.c	2018-08-14 15:40:13.663103960 +0200
+--- openssl-1.1.0i.orig/ssl/ssl_lib.c	2018-08-14 14:45:09.000000000 +0200
++++ openssl-1.1.0i/ssl/ssl_lib.c	2018-08-14 16:25:04.140629293 +0200
 @@ -2597,13 +2597,17 @@ SSL_CTX *SSL_CTX_new(const SSL_METHOD *m
      if (ret->param == NULL)
          goto err;
@@ -12177,8 +12177,8 @@ Index: openssl-1.1.0i/ssl/ssl_lib.c
      if ((ret->client_CA = sk_X509_NAME_new_null()) == NULL)
 Index: openssl-1.1.0i/test/dsatest.c
 ===================================================================
---- openssl-1.1.0i.orig/test/dsatest.c	2018-08-14 15:40:06.887060966 +0200
-+++ openssl-1.1.0i/test/dsatest.c	2018-08-14 15:40:13.663103960 +0200
+--- openssl-1.1.0i.orig/test/dsatest.c	2018-08-14 14:45:10.000000000 +0200
++++ openssl-1.1.0i/test/dsatest.c	2018-08-14 16:25:04.140629293 +0200
 @@ -32,41 +32,42 @@ int main(int argc, char *argv[])
  
  static int dsa_cb(int p, int n, BN_GENCB *arg);
@@ -12269,8 +12269,8 @@ Index: openssl-1.1.0i/test/dsatest.c
      if (h != 2) {
 Index: openssl-1.1.0i/util/mkdef.pl
 ===================================================================
---- openssl-1.1.0i.orig/util/mkdef.pl	2018-08-14 15:40:06.887060966 +0200
-+++ openssl-1.1.0i/util/mkdef.pl	2018-08-14 15:40:13.667103984 +0200
+--- openssl-1.1.0i.orig/util/mkdef.pl	2018-08-14 14:45:10.000000000 +0200
++++ openssl-1.1.0i/util/mkdef.pl	2018-08-14 16:25:04.140629293 +0200
 @@ -312,6 +312,8 @@ $crypto.=" include/openssl/modes.h";
  $crypto.=" include/openssl/async.h";
  $crypto.=" include/openssl/ct.h";