From 5ce38c90cf43ee79cd999716ea83a5a44eeb819e Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <glin@suse.com>
Date: Tue, 28 Jul 2015 11:46:38 -0400
Subject: Update openssl to 1.0.2d

Also update Cryptlib to edk2 r17731

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>
---
 Cryptlib/OpenSSL/crypto/err/err_all.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'Cryptlib/OpenSSL/crypto/err/err_all.c')

diff --git a/Cryptlib/OpenSSL/crypto/err/err_all.c b/Cryptlib/OpenSSL/crypto/err/err_all.c
index 6e12a7e6..d7575a7e 100644
--- a/Cryptlib/OpenSSL/crypto/err/err_all.c
+++ b/Cryptlib/OpenSSL/crypto/err/err_all.c
@@ -64,6 +64,9 @@
 #endif
 #include <openssl/buffer.h>
 #include <openssl/bio.h>
+#ifndef OPENSSL_NO_COMP
+# include <openssl/comp.h>
+#endif
 #ifndef OPENSSL_NO_RSA
 # include <openssl/rsa.h>
 #endif
@@ -97,16 +100,13 @@
 #ifdef OPENSSL_FIPS
 # include <openssl/fips.h>
 #endif
-
+#include <openssl/ts.h>
 #ifndef OPENSSL_NO_CMS
 # include <openssl/cms.h>
 #endif
 #ifndef OPENSSL_NO_JPAKE
 # include <openssl/jpake.h>
 #endif
-#ifndef OPENSSL_NO_COMP
-# include <openssl/comp.h>
-#endif
 
 void ERR_load_crypto_strings(void)
 {
@@ -130,6 +130,9 @@ void ERR_load_crypto_strings(void)
     ERR_load_ASN1_strings();
     ERR_load_CONF_strings();
     ERR_load_CRYPTO_strings();
+# ifndef OPENSSL_NO_COMP
+    ERR_load_COMP_strings();
+# endif
 # ifndef OPENSSL_NO_EC
     ERR_load_EC_strings();
 # endif
@@ -146,6 +149,7 @@ void ERR_load_crypto_strings(void)
     ERR_load_PKCS12_strings();
     ERR_load_RAND_strings();
     ERR_load_DSO_strings();
+    ERR_load_TS_strings();
 # ifndef OPENSSL_NO_ENGINE
     ERR_load_ENGINE_strings();
 # endif
@@ -160,6 +164,5 @@ void ERR_load_crypto_strings(void)
 # ifndef OPENSSL_NO_JPAKE
     ERR_load_JPAKE_strings();
 # endif
-    ERR_load_COMP_strings();
 #endif
 }
-- 
cgit v1.2.3