From 1ffb64c14b7af11992adb713dfd05dc403678a21 Mon Sep 17 00:00:00 2001 From: Ryan Ware Date: Tue, 13 Aug 2013 16:04:16 -0700 Subject: Imported Upstream version 1.0.1e --- doc/crypto/EVP_PKEY_verify_recover.pod | 6 +++--- openssl.spec | 5 ++++- ssl/ssl_lib.c | 4 +++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/crypto/EVP_PKEY_verify_recover.pod b/doc/crypto/EVP_PKEY_verify_recover.pod index 23a28a9..399120e 100644 --- a/doc/crypto/EVP_PKEY_verify_recover.pod +++ b/doc/crypto/EVP_PKEY_verify_recover.pod @@ -29,7 +29,7 @@ B and the amount of data written to B. =head1 NOTES Normally an application is only interested in whether a signature verification -operation is successful in those cases the EVP_verify() function should be +operation is successful in those cases the EVP_verify() function should be used. Sometimes however it is useful to obtain the data originally signed using a @@ -58,7 +58,7 @@ Recover digest originally signed using PKCS#1 and SHA256 digest: EVP_PKEY_CTX *ctx; unsigned char *rout, *sig; - size_t routlen, siglen; + size_t routlen, siglen; EVP_PKEY *verify_key; /* NB: assumes verify_key, sig and siglen are already set up * and that verify_key is an RSA public key @@ -94,7 +94,7 @@ L, L, L, L, -L +L =head1 HISTORY diff --git a/openssl.spec b/openssl.spec index 44147ce..75d0056 100644 --- a/openssl.spec +++ b/openssl.spec @@ -1,5 +1,8 @@ %define _unpackaged_files_terminate_build 0 - +%define libmaj 1 +%define libmin 0 +%define librel 1 +%define librev f Release: 1 %define openssldir /var/ssl diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 6dbc3c1..0aba069 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -2794,7 +2794,9 @@ 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->cert != NULL) + if (s->server) + return(ssl_get_server_send_cert(s)); + else if (s->cert != NULL) return(s->cert->key->x509); else return(NULL); -- cgit v1.2.3