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

remove c++ comments, switch ASN1 string back to first spot

Browse Source
This commit is contained in:
toddouska
2015-07-08 17:33:15 -06:00
parent 1383a0f1b5
commit e41ebcf5d4
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ssl.c
View File

@ -15230,8 +15230,9 @@ void* wolfSSL_GetRsaDecCtx(WOLFSSL* ssl)
(void)depth; (void)depth;
} }
void* WOLFSSL_get_app_data( const WOLFSSL *ssl) { void* WOLFSSL_get_app_data( const WOLFSSL *ssl)
//checkout exdata stuff... {
/* checkout exdata stuff... */
(void)ssl; (void)ssl;
return 0; return 0;

2
wolfssl/openssl/ssl.h
View File

@ -49,7 +49,6 @@ typedef WOLFSSL_CTX SSL_CTX;
typedef WOLFSSL_X509 X509; typedef WOLFSSL_X509 X509;
typedef WOLFSSL_X509_NAME X509_NAME; typedef WOLFSSL_X509_NAME X509_NAME;
typedef WOLFSSL_X509_CHAIN X509_CHAIN; typedef WOLFSSL_X509_CHAIN X509_CHAIN;
typedef WOLFSSL_ASN1_STRING ASN1_STRING;
/* redeclare guard */ /* redeclare guard */
@ -73,6 +72,7 @@ typedef WOLFSSL_X509_EXTENSION X509_EXTENSION;
typedef WOLFSSL_ASN1_TIME ASN1_TIME; typedef WOLFSSL_ASN1_TIME ASN1_TIME;
typedef WOLFSSL_ASN1_INTEGER ASN1_INTEGER; typedef WOLFSSL_ASN1_INTEGER ASN1_INTEGER;
typedef WOLFSSL_ASN1_OBJECT ASN1_OBJECT; typedef WOLFSSL_ASN1_OBJECT ASN1_OBJECT;
typedef WOLFSSL_ASN1_STRING ASN1_STRING;
typedef WOLFSSL_dynlock_value CRYPTO_dynlock_value; typedef WOLFSSL_dynlock_value CRYPTO_dynlock_value;
#define ASN1_UTCTIME WOLFSSL_ASN1_TIME #define ASN1_UTCTIME WOLFSSL_ASN1_TIME

10
wolfssl/ssl.h
View File

@ -1497,20 +1497,16 @@ WOLFSSL_API int wolfSSL_accept_ex(WOLFSSL*, HandShakeCallBack, TimeoutCallBack,
#endif #endif
//We also want this to be inside openssl extra, but clang throws an error #ifdef OPENSSL_EXTRA /*lighttp compatibility */
#ifdef HAVE_LIGHTY #ifdef HAVE_LIGHTY
typedef struct WOLFSSL_X509_NAME_ENTRY { typedef struct WOLFSSL_X509_NAME_ENTRY {
WOLFSSL_ASN1_OBJECT* object; WOLFSSL_ASN1_OBJECT* object;
WOLFSSL_ASN1_STRING* value; WOLFSSL_ASN1_STRING* value;
int set; int set;
int size; int size;
} WOLFSSL_X509_NAME_ENTRY; } WOLFSSL_X509_NAME_ENTRY;
#endif
#ifdef OPENSSL_EXTRA /*lighttp compatibility */
#ifdef HAVE_LIGHTY
#include <wolfssl/openssl/dh.h> #include <wolfssl/openssl/dh.h>