wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-01 03:34:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

maintain lighttpd port

Browse Source
This commit is contained in:
Jacob Barthelmeh
2016-04-29 16:47:10 -06:00
parent 05e56b75f6
commit d1ab51e10f
4 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/internal.c
View File

@@ -1706,6 +1706,7 @@ void InitX509Name(WOLFSSL_X509_NAME* name, int dynamicFlag)
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
XMEMSET(&name->fullName, 0, sizeof(DecodedName)); XMEMSET(&name->fullName, 0, sizeof(DecodedName));
XMEMSET(&name->cnEntry, 0, sizeof(WOLFSSL_X509_NAME_ENTRY)); XMEMSET(&name->cnEntry, 0, sizeof(WOLFSSL_X509_NAME_ENTRY));
name->cnEntry.value = &(name->cnEntry.data); /* point to internal data*/
name->x509 = NULL; name->x509 = NULL;
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA */
} }

8
src/ssl.c
View File

@@ -10312,7 +10312,7 @@ static void ExternalFreeX509(WOLFSSL_X509* x509)
WOLFSSL_X509_NAME_ENTRY* in) WOLFSSL_X509_NAME_ENTRY* in)
{ {
WOLFSSL_ENTER("wolfSSL_X509_NAME_ENTRY_get_data"); WOLFSSL_ENTER("wolfSSL_X509_NAME_ENTRY_get_data");
return &in->value; return in->value;
} }
@@ -17226,9 +17226,9 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl)
/* common name index case */ /* common name index case */
if (loc == name->fullName.cnIdx) { if (loc == name->fullName.cnIdx) {
/* get CN shortcut from x509 since it has null terminator */ /* get CN shortcut from x509 since it has null terminator */
name->cnEntry.value.data = name->x509->subjectCN; name->cnEntry.data.data = name->x509->subjectCN;
name->cnEntry.value.length = name->fullName.cnLen; name->cnEntry.data.length = name->fullName.cnLen;
name->cnEntry.value.type = ASN_COMMON_NAME; name->cnEntry.data.type = ASN_COMMON_NAME;
name->cnEntry.set = 1; name->cnEntry.set = 1;
return &(name->cnEntry); return &(name->cnEntry);
} }

13
wolfssl/internal.h
View File

@@ -45,9 +45,6 @@
#endif #endif
#ifndef NO_ASN #ifndef NO_ASN
#include <wolfssl/wolfcrypt/asn.h> #include <wolfssl/wolfcrypt/asn.h>
#ifdef OPENSSL_EXTRA
#include <wolfssl/openssl/asn1.h> /* for asn1 string and bit struct */
#endif
#endif #endif
#ifndef NO_MD5 #ifndef NO_MD5
#include <wolfssl/wolfcrypt/md5.h> #include <wolfssl/wolfcrypt/md5.h>
@@ -2442,16 +2439,6 @@ typedef struct Arrays {
#define MAX_DATE_SZ 32 #define MAX_DATE_SZ 32
#endif #endif
#ifdef OPENSSL_EXTRA
struct WOLFSSL_X509_NAME_ENTRY {
WOLFSSL_ASN1_OBJECT* object; /* not defined yet */
WOLFSSL_ASN1_STRING value;
int set;
int size;
};
#endif /* OPENSSL_EXTRA */
struct WOLFSSL_X509_NAME { struct WOLFSSL_X509_NAME {
char *name; char *name;
char staticName[ASN_NAME_MAX]; char staticName[ASN_NAME_MAX];

10
wolfssl/ssl.h
View File

@@ -1650,6 +1650,16 @@ WOLFSSL_API char* wolfSSL_ASN1_TIME_to_string(WOLFSSL_ASN1_TIME* time,
#endif /* WOLFSSL_MYSQL_COMPATIBLE */ #endif /* WOLFSSL_MYSQL_COMPATIBLE */
#ifdef OPENSSL_EXTRA /*lighttp compatibility */ #ifdef OPENSSL_EXTRA /*lighttp compatibility */
#include <wolfssl/openssl/asn1.h>
struct WOLFSSL_X509_NAME_ENTRY {
WOLFSSL_ASN1_OBJECT* object; /* not defined yet */
WOLFSSL_ASN1_STRING data;
WOLFSSL_ASN1_STRING* value; /* points to data, for lighttpd port */
int set;
int size;
};
#if defined(HAVE_LIGHTY) || defined(WOLFSSL_MYSQL_COMPATIBLE) #if defined(HAVE_LIGHTY) || defined(WOLFSSL_MYSQL_COMPATIBLE)
WOLFSSL_API void wolfSSL_X509_NAME_free(WOLFSSL_X509_NAME *name); WOLFSSL_API void wolfSSL_X509_NAME_free(WOLFSSL_X509_NAME *name);
WOLFSSL_API char wolfSSL_CTX_use_certificate(WOLFSSL_CTX *ctx, WOLFSSL_X509 *x); WOLFSSL_API char wolfSSL_CTX_use_certificate(WOLFSSL_CTX *ctx, WOLFSSL_X509 *x);