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

Wrap some long lines.

Browse Source
This commit is contained in:
TakayukiMatsuo
2021-03-17 06:58:51 +09:00
parent 9fd8fde714
commit 3bd7127188
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/api.c
View File

@@ -2598,7 +2598,7 @@ static void test_wolfSSL_EVP_EncodeUpdate(void)
total += outl; total += outl;
AssertIntNE(outl, 0); /* some output is expected this time*/ AssertIntNE(outl, 0); /* some output is expected this time*/
AssertIntEQ(outl, BASE64_ENCODED_BLOCK_SIZE +1); /* 64 bytes and LF */ AssertIntEQ(outl, BASE64_ENCODE_RESULT_BLOCK_SIZE +1); /* 64 bytes and LF */
AssertIntEQ( AssertIntEQ(
XSTRNCMP((const char*)encOutBuff,(const char*)enc1,sizeof(enc1) ),0); XSTRNCMP((const char*)encOutBuff,(const char*)enc1,sizeof(enc1) ),0);
@@ -2669,7 +2669,8 @@ static void test_wolfSSL_EVP_DecodeUpdate(void)
WOLFSSL_EVP_ENCODE_CTX* ctx = wolfSSL_EVP_ENCODE_CTX_new(); WOLFSSL_EVP_ENCODE_CTX* ctx = wolfSSL_EVP_ENCODE_CTX_new();
wolfSSL_EVP_DecodeInit(ctx); wolfSSL_EVP_DecodeInit(ctx);
const unsigned char enc1[] = {"VGhpcyBpcyBhIGJhc2U2NCBkZWNvZGluZyB0ZXN0Lg==\n"}; const unsigned char enc1[] =
{"VGhpcyBpcyBhIGJhc2U2NCBkZWNvZGluZyB0ZXN0Lg==\n"};
/* const unsigned char plain1[] = /* const unsigned char plain1[] =
{"This is a base64 decoding test."} */ {"This is a base64 decoding test."} */
@@ -2736,7 +2737,8 @@ static void test_wolfSSL_EVP_DecodeUpdate(void)
/* decode correct base64 string */ /* decode correct base64 string */
const unsigned char enc2[] = {"VGhpcyBpcyBhIGJhc2U2NCBkZWNvZGluZyB0ZXN0Lg==\n"}; const unsigned char enc2[] =
{"VGhpcyBpcyBhIGJhc2U2NCBkZWNvZGluZyB0ZXN0Lg==\n"};
const unsigned char plain2[] = const unsigned char plain2[] =
{"This is a base64 decoding test."}; {"This is a base64 decoding test."};
@@ -2768,7 +2770,8 @@ static void test_wolfSSL_EVP_DecodeUpdate(void)
/* decode correct base64 string which does not have '\n' in its last*/ /* decode correct base64 string which does not have '\n' in its last*/
const unsigned char enc3[] = {"VGhpcyBpcyBhIGJhc2U2NCBkZWNvZGluZyB0ZXN0Lg=="}; /* 44 chars */ const unsigned char enc3[] =
{"VGhpcyBpcyBhIGJhc2U2NCBkZWNvZGluZyB0ZXN0Lg=="}; /* 44 chars */
const unsigned char plain3[] = const unsigned char plain3[] =
{"This is a base64 decoding test."}; /* 31 chars */ {"This is a base64 decoding test."}; /* 31 chars */
@@ -2801,8 +2804,9 @@ static void test_wolfSSL_EVP_DecodeUpdate(void)
/* decode string which has a padding char ('=') in the illegal position*/ /* decode string which has a padding char ('=') in the illegal position*/
const unsigned char enc4[] = {"VGhpcyBpcyBhIGJhc2U2N=CBkZWNvZGluZyB0ZXN0Lg==\n"}; const unsigned char enc4[] =
/* ^-- illegal padding */ {"VGhpcyBpcyBhIGJhc2U2N=CBkZWNvZGluZyB0ZXN0Lg==\n"};
wolfSSL_EVP_EncodeInit(ctx); wolfSSL_EVP_EncodeInit(ctx);

6
wolfcrypt/src/evp.c
View File

@@ -6955,7 +6955,7 @@ int wolfSSL_EVP_EncodeUpdate(WOLFSSL_EVP_ENCODE_CTX* ctx,
/* check if a block for encoding exists in ctx.data, if so encode it */ /* check if a block for encoding exists in ctx.data, if so encode it */
if (ctx->remaining >= BASE64_ENCODE_BLOCK_SIZE) { if (ctx->remaining >= BASE64_ENCODE_BLOCK_SIZE) {
/* Base64_Encode asks the out buff size via the 4th param*/ /* Base64_Encode asks the out buff size via the 4th param*/
outsz = BASE64_ENCODED_BLOCK_SIZE + 1; outsz = BASE64_ENCODE_RESULT_BLOCK_SIZE + 1;
res = Base64_Encode(ctx->data, BASE64_ENCODE_BLOCK_SIZE, out, res = Base64_Encode(ctx->data, BASE64_ENCODE_BLOCK_SIZE, out,
&outsz); &outsz);
if (res == 0) if (res == 0)
@@ -6974,7 +6974,7 @@ int wolfSSL_EVP_EncodeUpdate(WOLFSSL_EVP_ENCODE_CTX* ctx,
*/ */
while (inl >= BASE64_ENCODE_BLOCK_SIZE) { while (inl >= BASE64_ENCODE_BLOCK_SIZE) {
outsz = BASE64_ENCODED_BLOCK_SIZE + 1; /* 64 byte and one for LF*/ outsz = BASE64_ENCODE_RESULT_BLOCK_SIZE + 1;/* 64 byte and one for LF*/
res = Base64_Encode(in, BASE64_ENCODE_BLOCK_SIZE,out,&outsz); res = Base64_Encode(in, BASE64_ENCODE_BLOCK_SIZE,out,&outsz);
if (res == 0) { if (res == 0) {
in += BASE64_ENCODE_BLOCK_SIZE; in += BASE64_ENCODE_BLOCK_SIZE;
@@ -7015,7 +7015,7 @@ void wolfSSL_EVP_EncodeFinal(WOLFSSL_EVP_ENCODE_CTX* ctx,
return; return;
} }
/* process remaining data in ctx */ /* process remaining data in ctx */
outsz = BASE64_ENCODED_BLOCK_SIZE + 1; /* 64 byte and one for LF*/ outsz = BASE64_ENCODE_RESULT_BLOCK_SIZE + 1; /* 64 byte and one for LF*/
res = Base64_Encode(ctx->data, ctx->remaining ,out, &outsz); res = Base64_Encode(ctx->data, ctx->remaining ,out, &outsz);
if (res == 0) if (res == 0)
*outl = outsz; *outl = outsz;

2
wolfssl/openssl/evp.h
View File

@@ -379,7 +379,7 @@ struct WOLFSSL_EVP_PKEY_CTX {
#if defined(WOLFSSL_BASE64_ENCODE) || defined(WOLFSSL_BASE64_DECODE) #if defined(WOLFSSL_BASE64_ENCODE) || defined(WOLFSSL_BASE64_DECODE)
#define BASE64_ENCODE_BLOCK_SIZE 48 #define BASE64_ENCODE_BLOCK_SIZE 48
#define BASE64_ENCODED_BLOCK_SIZE 64 #define BASE64_ENCODE_RESULT_BLOCK_SIZE 64
#define BASE64_DECODE_BLOCK_SIZE 4 #define BASE64_DECODE_BLOCK_SIZE 4
struct WOLFSSL_EVP_ENCODE_CTX { struct WOLFSSL_EVP_ENCODE_CTX {