feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Adding stack object type support to sk_value

Browse Source
This commit is contained in:
Eric Blankenhorn
2019-09-09 17:02:57 -05:00
parent b92509144b
commit 793df114f3
2 changed files with 50 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/ssl.c
View File

@ -25760,11 +25760,51 @@ int wolfSSL_sk_num(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)* sk)
void* wolfSSL_sk_value(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)* sk, int i)
{
#if defined(OPENSSL_ALL) || defined(WOLFSSL_QT)
int offset = i;
WOLFSSL_GENERAL_NAME* gn;
#endif
WOLFSSL_ENTER("wolfSSL_sk_value");
for (; sk != NULL && i > 0; i--)
sk = sk->next;
if (sk == NULL)
return NULL;
return (void*)sk->data.obj;
switch (sk->type) {
#if defined(OPENSSL_ALL) || defined(WOLFSSL_QT)
case STACK_TYPE_X509:
return (void*)sk->data.x509;
case STACK_TYPE_CIPHER:
if (sk->data.cipher == NULL)
return NULL;
sk->data.cipher->offset = offset;
return (void*)sk->data.cipher;
case STACK_TYPE_GEN_NAME:
gn = (WOLFSSL_GENERAL_NAME*)sk->data.obj;
if (gn == NULL)
return NULL;
gn->type = sk->data.obj->type;
gn->d.ia5 = sk->data.obj->d.ia5;
gn->d.iPAddress = sk->data.obj->d.iPAddress;
gn->d.dNSName = sk->data.obj->d.dNSName;
gn->d.uniformResourceIdentifier =
sk->data.obj->d.uniformResourceIdentifier;
return (void*)gn;
case STACK_TYPE_ACCESS_DESCRIPTION:
return (void*)sk->data.access;
case STACK_TYPE_OBJ:
return (void*)sk->data.obj;
break;
case STACK_TYPE_NULL:
return (void*)sk->data.generic;
break;
case STACK_TYPE_X509_EXT:
return (void*)sk->data.ext;
#endif
default:
return (void*)sk->data.obj;
}
}
/* Free the structure for ASN1_OBJECT stack */

9
wolfssl/internal.h
View File

@ -1865,11 +1865,20 @@ WOLFSSL_LOCAL int SetCipherList(WOLFSSL_CTX*, Suites*, const char* list);
#endif /* WOLFSSL_DTLS_EXPORT_TYPES */
#if defined(OPENSSL_ALL) || defined(WOLFSSL_QT)
#define UINT8_SZ 255
#endif
/* wolfSSL Cipher type just points back to SSL */
struct WOLFSSL_CIPHER {
byte cipherSuite0;
byte cipherSuite;
WOLFSSL* ssl;
#if defined(OPENSSL_ALL) || defined(WOLFSSL_QT)
char description[UINT8_SZ];
unsigned long offset;
unsigned int in_stack; /* TRUE if added to stack in wolfSSL_get_ciphers_compat */
int bits;
#endif
};