You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
47 lines
1.6 KiB
47 lines
1.6 KiB
12 years ago
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# Filename: package/.../openssl/openssl-1.0.1e-SSL_get_certificate.patch
|
||
|
|
# Copyright (C) 2013 The OpenSDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
From 147dbb2fe3bead7a10e2f280261b661ce7af7adc Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Dr. Stephen Henson" <steve@openssl.org>
|
||
|
|
Date: Mon, 11 Feb 2013 18:24:03 +0000
|
||
|
|
Subject: [PATCH] Fix for SSL_get_certificate
|
||
|
|
|
||
|
|
Now we set the current certificate to the one used by a server
|
||
|
|
there is no need to call ssl_get_server_send_cert which will
|
||
|
|
fail if we haven't sent a certificate yet.
|
||
|
|
---
|
||
|
|
ssl/ssl_lib.c | 4 +---
|
||
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
|
||
|
|
index 14d143d..ff5a85a 100644
|
||
|
|
--- a/ssl/ssl_lib.c
|
||
|
|
+++ b/ssl/ssl_lib.c
|
||
|
|
@@ -2792,9 +2792,7 @@ void ssl_clear_cipher_ctx(SSL *s)
|
||
|
|
/* Fix this function so that it takes an optional type parameter */
|
||
|
|
X509 *SSL_get_certificate(const SSL *s)
|
||
|
|
{
|
||
|
|
- if (s->server)
|
||
|
|
- return(ssl_get_server_send_cert(s));
|
||
|
|
- else if (s->cert != NULL)
|
||
|
|
+ if (s->cert != NULL)
|
||
|
|
return(s->cert->key->x509);
|
||
|
|
else
|
||
|
|
return(NULL);
|
||
|
|
--
|
||
|
|
1.7.9.5
|
||
|
|
|