From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 5 Feb 2014 18:55:37 +0000 (+0000)
Subject: Oops, get selection logic right.
X-Git-Tag: OpenSSL_1_0_2-beta1~49
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3bff195dca617c4ec1630945fef93b792b418cc8;p=oweals%2Fopenssl.git

Oops, get selection logic right.
(cherry picked from commit 3880579240d476d21f68fd01a391dd325920f479)
---

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index e35f18c5d8..372910f573 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3914,9 +3914,10 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
 		break;
 
 	case SSL_CTRL_GET_EXTRA_CHAIN_CERTS:
-		*(STACK_OF(X509) **)parg =  ctx->extra_certs;
-		if (parg == NULL && larg == 0)
+		if (ctx->extra_certs == NULL && larg == 0)
 			*(STACK_OF(X509) **)parg =  ctx->cert->key->chain;
+		else
+			*(STACK_OF(X509) **)parg =  ctx->extra_certs;
 		break;
 
 	case SSL_CTRL_CLEAR_EXTRA_CHAIN_CERTS: