wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bio_enc_test

Browse source 
There was a block of code at the start that used the Camellia cipher. The
original idea behind this was to fill the buffer with non-zero data so that
oversteps can be detected. However this block failed when using no-camellia.
This has been replaced with a RAND_bytes() call.

I also updated the the CTR test section, since it seems to be using a CBC
cipher instead of a CTR cipher.

Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Matt Caswell 2016-08-22 16:11:55 +01:00
parent 8b7c51a0e4
commit 61884b8140
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
test/bio_enc_test.c
View file

@ -10,6 +10,7 @@
#include <string.h> #include <string.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/rand.h>
int main() int main()
{ {
@ -19,12 +20,9 @@ int main()
unsigned char out[1024], ref[1024]; unsigned char out[1024], ref[1024];
int i, lref, len; int i, lref, len;
b = BIO_new(BIO_f_cipher()); /* Fill buffer with non-zero data so that over steps can be detected */
if (!BIO_set_cipher(b, EVP_camellia_128_ctr(), key, NULL, 0)) if (RAND_bytes(inp, sizeof(inp)) <= 0)
return -1; return -1;
BIO_push(b, BIO_new_mem_buf(inp, sizeof(inp)));
lref = BIO_read(b, inp, sizeof(inp));
BIO_free_all(b);
/* /*
* Exercise CBC cipher * Exercise CBC cipher
@ -87,7 +85,7 @@ int main()
/* reference output for single-chunk operation */ /* reference output for single-chunk operation */
b = BIO_new(BIO_f_cipher()); b = BIO_new(BIO_f_cipher());
if (!BIO_set_cipher(b, EVP_aes_128_cbc(), key, NULL, 0)) if (!BIO_set_cipher(b, EVP_aes_128_ctr(), key, NULL, 0))
return -1; return -1;
BIO_push(b, BIO_new_mem_buf(inp, sizeof(inp))); BIO_push(b, BIO_new_mem_buf(inp, sizeof(inp)));
lref = BIO_read(b, ref, sizeof(ref)); lref = BIO_read(b, ref, sizeof(ref));
@ -96,7 +94,7 @@ int main()
/* perform split operations and compare to reference */ /* perform split operations and compare to reference */
for (i = 1; i < lref; i++) { for (i = 1; i < lref; i++) {
b = BIO_new(BIO_f_cipher()); b = BIO_new(BIO_f_cipher());
if (!BIO_set_cipher(b, EVP_aes_128_cbc(), key, NULL, 0)) if (!BIO_set_cipher(b, EVP_aes_128_ctr(), key, NULL, 0))
return -1; return -1;
BIO_push(b, BIO_new_mem_buf(inp, sizeof(inp))); BIO_push(b, BIO_new_mem_buf(inp, sizeof(inp)));
memset(out, 0, sizeof(out)); memset(out, 0, sizeof(out));
@ -121,7 +119,7 @@ int main()
int delta; int delta;
b = BIO_new(BIO_f_cipher()); b = BIO_new(BIO_f_cipher());
if (!BIO_set_cipher(b, EVP_aes_128_cbc(), key, NULL, 0)) if (!BIO_set_cipher(b, EVP_aes_128_ctr(), key, NULL, 0))
return -1; return -1;
BIO_push(b, BIO_new_mem_buf(inp, sizeof(inp))); BIO_push(b, BIO_new_mem_buf(inp, sizeof(inp)));
memset(out, 0, sizeof(out)); memset(out, 0, sizeof(out));