conflict on packages not having strict openssl dependency
[packages/openssl.git] / get_certificate.patch
1 From: "Dr. Stephen Henson" <steve@openssl.org>
2 Date: Mon, 11 Feb 2013 18:24:03 +0000
3 Subject: Fix for SSL_get_certificate
4 Origin: upstream: http://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=147dbb2fe3bead7a10e2f280261b661ce7af7adc
5 Bug-Debian: http://bugs.debian.org/703031
6
7
8 Now we set the current certificate to the one used by a server
9 there is no need to call ssl_get_server_send_cert which will
10 fail if we haven't sent a certificate yet.
11
12 diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
13 index 14d143d..ff5a85a 100644
14 --- a/ssl/ssl_lib.c
15 +++ b/ssl/ssl_lib.c
16 @@ -2792,9 +2792,7 @@ void ssl_clear_cipher_ctx(SSL *s)
17  /* Fix this function so that it takes an optional type parameter */
18  X509 *SSL_get_certificate(const SSL *s)
19         {
20 -       if (s->server)
21 -               return(ssl_get_server_send_cert(s));
22 -       else if (s->cert != NULL)
23 +       if (s->cert != NULL)
24                 return(s->cert->key->x509);
25         else
26                 return(NULL);
27
This page took 0.030496 seconds and 3 git commands to generate.