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

remove hard tabs and other minor fixes

Browse Source
This commit is contained in:
Takashi Kojo
2021-07-30 07:07:40 +09:00
parent 297ae23521
commit bad9a973b4
1 changed files with 56 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
tests/api.c
View File

@ -36521,19 +36521,19 @@ tgZl96bcAGdru8OpQYP7x/rI4h5+rwA/kwIBAg==\n\
static void binary_dump(void *ptr, int size) static void binary_dump(void *ptr, int size)
{ {
#ifdef WOLFSSL_EVP_PRINT #ifdef WOLFSSL_EVP_PRINT
int i = 0; int i = 0;
unsigned char *p = (unsigned char *) ptr; unsigned char *p = (unsigned char *) ptr;
printf("{"); printf("{");
while((p != NULL) && (i < size)) { while((p != NULL) && (i < size)) {
if((i % 8) == 0) { if((i % 8) == 0) {
printf("\n"); printf("\n");
printf(" "); printf(" ");
} }
printf("0x%02x, ", p[i]); printf("0x%02x, ", p[i]);
i++; i++;
} }
printf("\n};\n"); printf("\n};\n");
#else #else
(void) ptr; (void) ptr;
(void) size; (void) size;
@ -36544,15 +36544,15 @@ static int last_val = 0x0f;
static int check_result(unsigned char *data, int len) static int check_result(unsigned char *data, int len)
{ {
int i; int i;
for( ; len; ) { for( ; len; ) {
last_val = (last_val + 1) % 16; last_val = (last_val + 1) % 16;
for(i = 0; i < 16; len--, i++, data++) for(i = 0; i < 16; len--, i++, data++)
if(*data != last_val) { if(*data != last_val) {
return -1; return -1;
} }
} }
return 0; return 0;
} }
@ -36566,13 +36566,13 @@ static void init_offset()
} }
static void get_record(unsigned char *data, unsigned char *buf, int len) static void get_record(unsigned char *data, unsigned char *buf, int len)
{ {
memcpy(buf, data+r_offset, len); XMEMCPY(buf, data+r_offset, len);
r_offset += len; r_offset += len;
} }
static void set_record(unsigned char *data, unsigned char *buf, int len) static void set_record(unsigned char *data, unsigned char *buf, int len)
{ {
memcpy(data+w_offset, buf, len); XMEMCPY(data+w_offset, buf, len);
w_offset += len; w_offset += len;
} }
@ -36587,7 +36587,6 @@ static void set_plain(unsigned char *plain, int rec)
for(j=0; j<BLOCKSZ; j++) for(j=0; j<BLOCKSZ; j++)
*p++ = (i % 16); *p++ = (i % 16);
} }
//binary_dump(plain, rec);
} }
#endif #endif
@ -36618,9 +36617,9 @@ static int test_wolfSSL_EVP_Cipher_extra(void)
int drive_len; int drive_len;
int ret = 0; int ret = 0;
EVP_CIPHER_CTX *evp = NULL; EVP_CIPHER_CTX *evp = NULL;
int klen = 0; int klen = 0;
int i, j; int i, j;
const EVP_CIPHER *type; const EVP_CIPHER *type;
@ -36633,26 +36632,26 @@ static int test_wolfSSL_EVP_Cipher_extra(void)
byte plain [BUFFSZ * RECORDS]; byte plain [BUFFSZ * RECORDS];
byte cipher[BUFFSZ * RECORDS]; byte cipher[BUFFSZ * RECORDS];
byte inb[BUFFSZ]; byte inb[BUFFSZ];
byte outb[BUFFSZ+16]; byte outb[BUFFSZ+16];
int outl, inl; int outl, inl;
iv = aes128_cbc_iv; iv = aes128_cbc_iv;
key = aes128_cbc_key; key = aes128_cbc_key;
keylen = sizeof(aes128_cbc_key); keylen = sizeof(aes128_cbc_key);
type = EVP_aes_128_cbc(); type = EVP_aes_128_cbc();
set_plain(plain, BUFFSZ * RECORDS); set_plain(plain, BUFFSZ * RECORDS);
SSL_library_init(); SSL_library_init();
AssertNotNull(evp = EVP_CIPHER_CTX_new()); AssertNotNull(evp = EVP_CIPHER_CTX_new());
AssertIntNE((ret = EVP_CipherInit(evp, type, NULL, iv, 0)), 0); AssertIntNE((ret = EVP_CipherInit(evp, type, NULL, iv, 0)), 0);
klen = EVP_CIPHER_CTX_key_length(evp); klen = EVP_CIPHER_CTX_key_length(evp);
if (klen > 0 && keylen != klen) { if (klen > 0 && keylen != klen) {
AssertIntNE(EVP_CIPHER_CTX_set_key_length(evp, keylen), 0); AssertIntNE(EVP_CIPHER_CTX_set_key_length(evp, keylen), 0);
} }
AssertIntNE((ret = EVP_CipherInit(evp, NULL, key, iv, 1)), 0); AssertIntNE((ret = EVP_CipherInit(evp, NULL, key, iv, 1)), 0);
@ -36664,9 +36663,9 @@ static int test_wolfSSL_EVP_Cipher_extra(void)
set_record(cipher, outb, outl); set_record(cipher, outb, outl);
} }
for (i = 0; test_drive[i]; i++) { for (i = 0; test_drive[i]; i++) {
AssertIntNE((ret = EVP_CipherInit(evp, NULL, key, iv, 1)), 0); AssertIntNE((ret = EVP_CipherInit(evp, NULL, key, iv, 1)), 0);
init_offset(); init_offset();
test_drive_len[i] = 0; test_drive_len[i] = 0;
@ -36676,40 +36675,40 @@ static int test_wolfSSL_EVP_Cipher_extra(void)
test_drive_len[i] += inl; test_drive_len[i] += inl;
get_record(plain, inb, inl); get_record(plain, inb, inl);
AssertIntNE((ret = EVP_EncryptUpdate(evp, outb, &outl, inb, inl)), 0); AssertIntNE((ret = EVP_EncryptUpdate(evp, outb, &outl, inb, inl)), 0);
/* output to cipher buffer, so that following Dec test can detect /* output to cipher buffer, so that following Dec test can detect
if any error */ if any error */
set_record(cipher, outb, outl); set_record(cipher, outb, outl);
} }
EVP_CipherFinal(evp, outb, &outl); EVP_CipherFinal(evp, outb, &outl);
if(outl > 0) if(outl > 0)
set_record(cipher, outb, outl); set_record(cipher, outb, outl);
} }
for (i = 0; test_drive[i]; i++) { for (i = 0; test_drive[i]; i++) {
last_val = 0x0f; last_val = 0x0f;
drive_len = 0; drive_len = 0;
AssertIntNE((ret = EVP_CipherInit(evp, NULL, key, iv, 0)), 0); AssertIntNE((ret = EVP_CipherInit(evp, NULL, key, iv, 0)), 0);
init_offset(); init_offset();
for (j = 0; test_drive[i][j]; j++){ for (j = 0; test_drive[i][j]; j++){
inl = test_drive[i][j]; inl = test_drive[i][j];
get_record(cipher, inb, inl); get_record(cipher, inb, inl);
AssertIntNE((ret = EVP_DecryptUpdate(evp, outb, &outl, inb, inl)), 0); AssertIntNE((ret = EVP_DecryptUpdate(evp, outb, &outl, inb, inl)), 0);
binary_dump(outb, outl); binary_dump(outb, outl);
AssertIntEQ((ret = check_result(outb, outl)), 0); AssertIntEQ((ret = check_result(outb, outl)), 0);
AssertFalse(outl > ((inl/16+1)*16) && outl > 16); AssertFalse(outl > ((inl/16+1)*16) && outl > 16);
drive_len += outl; drive_len += outl;
} }
ret = EVP_CipherFinal(evp, outb, &outl); ret = EVP_CipherFinal(evp, outb, &outl);
binary_dump(outb, outl); binary_dump(outb, outl);
ret = (((test_drive_len[i] % 16) != 0) && (ret == 0)) || ret = (((test_drive_len[i] % 16) != 0) && (ret == 0)) ||
@ -36717,11 +36716,11 @@ static int test_wolfSSL_EVP_Cipher_extra(void)
AssertTrue(ret); AssertTrue(ret);
} }
EVP_CIPHER_CTX_free(evp); EVP_CIPHER_CTX_free(evp);
#endif /* test_EVP_Cipher */ #endif /* test_EVP_Cipher */
return 0; return 0;
} }