mirrors
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix hard tabs

This commit is contained in:
Takashi Kojo 2017-11-30 09:08:59 +09:00
parent b664a1187b
commit 98235f9e36
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ssl.c
View File

@ -12785,7 +12785,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
WOLFSSL_ENTER("EVP_MD_CTX_new"); WOLFSSL_ENTER("EVP_MD_CTX_new");
ctx = (WOLFSSL_EVP_MD_CTX*)XMALLOC(sizeof *ctx, NULL, ctx = (WOLFSSL_EVP_MD_CTX*)XMALLOC(sizeof *ctx, NULL,
DYNAMIC_TYPE_OPENSSL); DYNAMIC_TYPE_OPENSSL);
if (ctx){ if (ctx){
wolfSSL_EVP_MD_CTX_init(ctx); wolfSSL_EVP_MD_CTX_init(ctx);
} }
return ctx; return ctx;
@ -12795,9 +12795,9 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
{ {
if (ctx) { if (ctx) {
WOLFSSL_ENTER("EVP_MD_CTX_free"); WOLFSSL_ENTER("EVP_MD_CTX_free");
wolfSSL_EVP_MD_CTX_cleanup(ctx); wolfSSL_EVP_MD_CTX_cleanup(ctx);
XFREE(ctx, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(ctx, NULL, DYNAMIC_TYPE_OPENSSL);
} }
} }
void wolfSSL_EVP_MD_CTX_init(WOLFSSL_EVP_MD_CTX* ctx) void wolfSSL_EVP_MD_CTX_init(WOLFSSL_EVP_MD_CTX* ctx)
@ -14845,7 +14845,7 @@ void wolfSSL_sk_X509_free(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk) {
/* free head of stack */ /* free head of stack */
if (sk->num == 1) { if (sk->num == 1) {
wolfSSL_X509_free(sk->data.x509); wolfSSL_X509_free(sk->data.x509);
} }
XFREE(sk, NULL, DYNAMIC_TYPE_X509); XFREE(sk, NULL, DYNAMIC_TYPE_X509);
} }
@ -15252,7 +15252,7 @@ void wolfSSL_sk_ASN1_OBJECT_free(WOLF_STACK_OF(WOLFSSL_ASN1_OBJECT)* sk)
/* free head of stack */ /* free head of stack */
if (sk->num == 1) { if (sk->num == 1) {
wolfSSL_ASN1_OBJECT_free(sk->data.obj); wolfSSL_ASN1_OBJECT_free(sk->data.obj);
} }
XFREE(sk, NULL, DYNAMIC_TYPE_ASN1); XFREE(sk, NULL, DYNAMIC_TYPE_ASN1);
} }
@ -22501,7 +22501,7 @@ int wolfSSL_EC_POINT_cmp(const WOLFSSL_EC_GROUP *group,
{ {
int ret; int ret;
(void)ctx; (void)ctx;
WOLFSSL_ENTER("wolfSSL_EC_POINT_cmp"); WOLFSSL_ENTER("wolfSSL_EC_POINT_cmp");
@ -22765,7 +22765,7 @@ int wolfSSL_ECDH_compute_key(void *out, size_t outlen,
(void)KDF; (void)KDF;
WOLFSSL_ENTER("wolfSSL_ECDH_compute_key"); WOLFSSL_ENTER("wolfSSL_ECDH_compute_key");
if (out == NULL || pub_key == NULL || pub_key->internal == NULL || if (out == NULL || pub_key == NULL || pub_key->internal == NULL ||
ecdh == NULL || ecdh->internal == NULL) { ecdh == NULL || ecdh->internal == NULL) {

24
tests/api.c
View File

@ -10363,11 +10363,12 @@ static void msg_cb(int write_p, int version, int content_type,
{ {
(void)write_p; (void)write_p;
(void)version; (void)version;
(void)content_type; (void)content_type;
(void)buf; (void)buf;
(void)len; (void)len;
(void)ssl; (void)ssl;
AssertTrue(arg == (void*)TEST_ARG);
AssertTrue(arg == (void*)TEST_ARG);
} }
#endif #endif
@ -10442,7 +10443,7 @@ static void test_wolfSSL_msgCb(void)
printf(resultFmt, passed); printf(resultFmt, passed);
#endif #endif
} }
static void test_wolfSSL_set_options(void) static void test_wolfSSL_set_options(void)
@ -10455,8 +10456,8 @@ static void test_wolfSSL_set_options(void)
unsigned char protos[] = { unsigned char protos[] = {
7, 't', 'l', 's', '/', '1', '.', '2', 7, 't', 'l', 's', '/', '1', '.', '2',
8, 'h', 't', 't', 'p', '/', '1', '.', '1' 8, 'h', 't', 't', 'p', '/', '1', '.', '1'
}; };
unsigned int len = sizeof(protos); unsigned int len = sizeof(protos);
void *arg = (void *)TEST_ARG; void *arg = (void *)TEST_ARG;
@ -10514,7 +10515,8 @@ static void test_wolfSSL_set_options(void)
#endif /* defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \ #endif /* defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \
!defined(NO_FILESYSTEM) && !defined(NO_RSA) */ !defined(NO_FILESYSTEM) && !defined(NO_RSA) */
} }
#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS)
#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS)
static int verify_cb(int ok, X509_STORE_CTX *ctx) static int verify_cb(int ok, X509_STORE_CTX *ctx)
{ {
(void) ok; (void) ok;
@ -10526,8 +10528,8 @@ static int verify_cb(int ok, X509_STORE_CTX *ctx)
static void test_wolfSSL_X509_STORE_CTX(void) static void test_wolfSSL_X509_STORE_CTX(void)
{ {
#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) #if defined(OPENSSL_EXTRA) && !defined(NO_CERTS)
X509_STORE_CTX *ctx = NULL ; X509_STORE_CTX *ctx = NULL ;
printf(testingFmt, "test_wolfSSL_X509_STORE_CTX(()"); printf(testingFmt, "test_wolfSSL_X509_STORE_CTX(()");
AssertNotNull(ctx = X509_STORE_CTX_new()); AssertNotNull(ctx = X509_STORE_CTX_new());