Oops, get selection logic right.

(cherry picked from commit 3880579240d476d21f68fd01a391dd325920f479)

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index e35f18c5d89c05d24b44def96b9e2ef3b521a233..372910f573c8e4f13390884695029ef4159d3d25 100644 (file)
--- 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: