From 5cbe75a3facfe8256454595ca3abbff7ad6076b0 Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <glin@suse.com>
Date: Tue, 19 Aug 2014 14:20:23 -0400
Subject: Update openssl to 0.9.8zb

Also update to Tiano Cryptlib r15802 and remove the execute mode
bits from the C and header files of openssl
---
 Cryptlib/OpenSSL/crypto/ocsp/ocsp_asn.c |  0
 Cryptlib/OpenSSL/crypto/ocsp/ocsp_cl.c  |  0
 Cryptlib/OpenSSL/crypto/ocsp/ocsp_err.c |  0
 Cryptlib/OpenSSL/crypto/ocsp/ocsp_ext.c |  0
 Cryptlib/OpenSSL/crypto/ocsp/ocsp_ht.c  |  3 +++
 Cryptlib/OpenSSL/crypto/ocsp/ocsp_lib.c | 13 ++++++++++++-
 Cryptlib/OpenSSL/crypto/ocsp/ocsp_prn.c |  0
 Cryptlib/OpenSSL/crypto/ocsp/ocsp_srv.c |  0
 Cryptlib/OpenSSL/crypto/ocsp/ocsp_vfy.c |  0
 9 files changed, 15 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/ocsp/ocsp_asn.c
 mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/ocsp/ocsp_cl.c
 mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/ocsp/ocsp_err.c
 mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/ocsp/ocsp_ext.c
 mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/ocsp/ocsp_ht.c
 mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/ocsp/ocsp_lib.c
 mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/ocsp/ocsp_prn.c
 mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/ocsp/ocsp_srv.c
 mode change 100755 => 100644 Cryptlib/OpenSSL/crypto/ocsp/ocsp_vfy.c

(limited to 'Cryptlib/OpenSSL/crypto/ocsp')

diff --git a/Cryptlib/OpenSSL/crypto/ocsp/ocsp_asn.c b/Cryptlib/OpenSSL/crypto/ocsp/ocsp_asn.c
old mode 100755
new mode 100644
diff --git a/Cryptlib/OpenSSL/crypto/ocsp/ocsp_cl.c b/Cryptlib/OpenSSL/crypto/ocsp/ocsp_cl.c
old mode 100755
new mode 100644
diff --git a/Cryptlib/OpenSSL/crypto/ocsp/ocsp_err.c b/Cryptlib/OpenSSL/crypto/ocsp/ocsp_err.c
old mode 100755
new mode 100644
diff --git a/Cryptlib/OpenSSL/crypto/ocsp/ocsp_ext.c b/Cryptlib/OpenSSL/crypto/ocsp/ocsp_ext.c
old mode 100755
new mode 100644
diff --git a/Cryptlib/OpenSSL/crypto/ocsp/ocsp_ht.c b/Cryptlib/OpenSSL/crypto/ocsp/ocsp_ht.c
old mode 100755
new mode 100644
index 92aba08c..fb87cd76
--- a/Cryptlib/OpenSSL/crypto/ocsp/ocsp_ht.c
+++ b/Cryptlib/OpenSSL/crypto/ocsp/ocsp_ht.c
@@ -464,6 +464,9 @@ OCSP_RESPONSE *OCSP_sendreq_bio(BIO *b, char *path, OCSP_REQUEST *req)
 
 	ctx = OCSP_sendreq_new(b, path, req, -1);
 
+	if (!ctx)
+		return NULL;
+
 	do
 		{
 		rv = OCSP_sendreq_nbio(&resp, ctx);
diff --git a/Cryptlib/OpenSSL/crypto/ocsp/ocsp_lib.c b/Cryptlib/OpenSSL/crypto/ocsp/ocsp_lib.c
old mode 100755
new mode 100644
index 441ccb7a..5883b4e0
--- a/Cryptlib/OpenSSL/crypto/ocsp/ocsp_lib.c
+++ b/Cryptlib/OpenSSL/crypto/ocsp/ocsp_lib.c
@@ -220,8 +220,19 @@ int OCSP_parse_url(char *url, char **phost, char **pport, char **ppath, int *pss
 
 	if (!*ppath) goto mem_err;
 
+	p = host;
+	if(host[0] == '[')
+		{
+		/* ipv6 literal */
+		host++;
+		p = strchr(host, ']');
+		if(!p) goto parse_err;
+		*p = '\0';
+		p++;
+		}
+
 	/* Look for optional ':' for port number */
-	if ((p = strchr(host, ':')))
+	if ((p = strchr(p, ':')))
 		{
 		*p = 0;
 		port = p + 1;
diff --git a/Cryptlib/OpenSSL/crypto/ocsp/ocsp_prn.c b/Cryptlib/OpenSSL/crypto/ocsp/ocsp_prn.c
old mode 100755
new mode 100644
diff --git a/Cryptlib/OpenSSL/crypto/ocsp/ocsp_srv.c b/Cryptlib/OpenSSL/crypto/ocsp/ocsp_srv.c
old mode 100755
new mode 100644
diff --git a/Cryptlib/OpenSSL/crypto/ocsp/ocsp_vfy.c b/Cryptlib/OpenSSL/crypto/ocsp/ocsp_vfy.c
old mode 100755
new mode 100644
-- 
cgit v1.2.3