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

add get_subjectCN

Browse Source
This commit is contained in:
toddouska
2011-10-04 09:29:10 -07:00
parent 33701c0d17
commit 290f94c8ad
5 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -428,7 +428,7 @@ AC_ARG_ENABLE(bump,
if test "$ENABLED_BUMP" = "yes" if test "$ENABLED_BUMP" = "yes"
then then
AM_CFLAGS="$AM_CFLAGS -DSESSION_CERTS -DLARGE_STATIC_BUFFERS -DCYASSL_CERT_GEN -DCYASSL_KEY_GEN" AM_CFLAGS="$AM_CFLAGS -DSESSION_CERTS -DLARGE_STATIC_BUFFERS -DCYASSL_CERT_GEN -DCYASSL_KEY_GEN -DOPENSSL_EXTRA"
fi fi
# ECC # ECC

1
cyassl/internal.h
View File

@@ -932,6 +932,7 @@ struct CYASSL_X509 {
CYASSL_X509_NAME subject; CYASSL_X509_NAME subject;
int serialSz; int serialSz;
byte serial[EXTERNAL_SERIAL_SIZE]; byte serial[EXTERNAL_SERIAL_SIZE];
char subjectCN[ASN_NAME_MAX]; /* common name short cut */
}; };

1
cyassl/ssl.h
View File

@@ -658,6 +658,7 @@ CYASSL_API int CyaSSL_get_chain_cert_pem(CYASSL_X509_CHAIN*, int idx,
unsigned char* buffer, int inLen, int* outLen); unsigned char* buffer, int inLen, int* outLen);
CYASSL_API const unsigned char* CyaSSL_get_sessionID(const CYASSL_SESSION* s); CYASSL_API const unsigned char* CyaSSL_get_sessionID(const CYASSL_SESSION* s);
CYASSL_API int CyaSSL_X509_get_serial_number(CYASSL_X509*,unsigned char*,int*); CYASSL_API int CyaSSL_X509_get_serial_number(CYASSL_X509*,unsigned char*,int*);
CYASSL_API char* CyaSSL_X509_get_subjectCN(CYASSL_X509*);
/* connect enough to get peer cert */ /* connect enough to get peer cert */
CYASSL_API int CyaSSL_connect_cert(CYASSL* ssl); CYASSL_API int CyaSSL_connect_cert(CYASSL* ssl);

15
src/internal.c
View File

@@ -1548,10 +1548,21 @@ static int DoCertificate(CYASSL* ssl, byte* input, word32* inOutIdx)
XSTRNCPY(ssl->peerCert.subject.name, dCert.subject, ASN_NAME_MAX); XSTRNCPY(ssl->peerCert.subject.name, dCert.subject, ASN_NAME_MAX);
XMEMCPY(ssl->peerCert.serial, dCert.serial, EXTERNAL_SERIAL_SIZE); XMEMCPY(ssl->peerCert.serial, dCert.serial, EXTERNAL_SERIAL_SIZE);
ssl->peerCert.serialSz = dCert.serialSz; ssl->peerCert.serialSz = dCert.serialSz;
if (dCert.subjectCNLen < ASN_NAME_MAX) {
XMEMCPY(ssl->peerCert.subjectCN,dCert.subjectCN,dCert.subjectCNLen);
ssl->peerCert.subjectCN[dCert.subjectCNLen] = '\0';
}
else
ssl->peerCert.subjectCN[0] = '\0';
#endif #endif
XMEMCPY(domain, dCert.subjectCN, dCert.subjectCNLen); /* store for callback use */
domain[dCert.subjectCNLen] = '\0'; if (dCert.subjectCNLen < ASN_NAME_MAX) {
XMEMCPY(domain, dCert.subjectCN, dCert.subjectCNLen);
domain[dCert.subjectCNLen] = '\0';
}
else
domain[0] = '\0';
if (!ssl->options.verifyNone && ssl->buffers.domainName.buffer) if (!ssl->options.verifyNone && ssl->buffers.domainName.buffer)
if (XSTRNCMP((char*)ssl->buffers.domainName.buffer, if (XSTRNCMP((char*)ssl->buffers.domainName.buffer,

9
src/ssl.c
View File

@@ -3792,7 +3792,6 @@ int CyaSSL_set_compression(CYASSL* ssl)
} }
int CyaSSL_ASN1_TIME_print(CYASSL_BIO* bio, const CYASSL_ASN1_TIME* asnTime) int CyaSSL_ASN1_TIME_print(CYASSL_BIO* bio, const CYASSL_ASN1_TIME* asnTime)
{ {
(void)bio; (void)bio;
@@ -4146,6 +4145,14 @@ int CyaSSL_set_compression(CYASSL* ssl)
return 0; return 0;
} }
char* CyaSSL_X509_get_subjectCN(CYASSL_X509* x509)
{
if (x509 == NULL)
return NULL;
return x509->subjectCN;
}
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA */