diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-02-05 18:55:37 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-02-05 18:57:23 +0000 |
| commit | 3bff195dca617c4ec1630945fef93b792b418cc8 (patch) | |
| tree | 1a9758cef9bf8ee97bc5d166d0b613dc9114ad64 /ssl/s3_lib.c | |
| parent | 41cf2d2518f8b7f31287984ea9f13bc9d55205dc (diff) | |
Oops, get selection logic right.
(cherry picked from commit 3880579240d476d21f68fd01a391dd325920f479)
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 5 |
1 files changed, 3 insertions, 2 deletions
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: |