Fix after rebase

This commit is contained in:
Eric Blankenhorn
2019-09-20 16:16:10 -05:00
parent f01e943448
commit 425548565f

View File

@@ -25776,10 +25776,8 @@ void* wolfSSL_sk_value(WOLFSSL_STACK* sk, int i)
return (void*)sk->data.x509; return (void*)sk->data.x509;
#if defined(OPENSSL_ALL) || defined(WOLFSSL_QT) #if defined(OPENSSL_ALL) || defined(WOLFSSL_QT)
case STACK_TYPE_CIPHER: case STACK_TYPE_CIPHER:
if (sk->data.cipher == NULL) sk->data.cipher.offset = offset;
return NULL; return (void*)&sk->data.cipher;
sk->data.cipher->offset = offset;
return (void*)sk->data.cipher;
case STACK_TYPE_GEN_NAME: case STACK_TYPE_GEN_NAME:
gn = (WOLFSSL_GENERAL_NAME*)sk->data.obj; gn = (WOLFSSL_GENERAL_NAME*)sk->data.obj;
if (gn == NULL) if (gn == NULL)