aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_crypto.c
diff options
context:
space:
mode:
authorArlo Breault <arlolra@gmail.com>2013-05-16 12:05:50 -0700
committerNick Mathewson <nickm@torproject.org>2013-05-17 10:11:33 -0400
commit0ab38b93660b4c9cb53771a454805e978ad9f406 (patch)
tree5efcd897310a37b85ad5435e8437cfab7dd92ec0 /src/test/test_crypto.c
parent95c34399cfb66a46371562f1532e8aa396243876 (diff)
downloadtor-0ab38b93660b4c9cb53771a454805e978ad9f406.tar
tor-0ab38b93660b4c9cb53771a454805e978ad9f406.tar.gz
Remove PK_PKCS1_PADDING
See #8792
Diffstat (limited to 'src/test/test_crypto.c')
-rw-r--r--src/test/test_crypto.c25
1 files changed, 11 insertions, 14 deletions
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index 4b7e7f298..839de7dd5 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -394,7 +394,7 @@ test_crypto_pk(void)
char *encoded = NULL;
char data1[1024], data2[1024], data3[1024];
size_t size;
- int i, j, p, len;
+ int i, len;
/* Public-key ciphers */
pk1 = pk_generate(0);
@@ -478,19 +478,16 @@ test_crypto_pk(void)
/* Try with hybrid encryption wrappers. */
crypto_rand(data1, 1024);
- for (i = 0; i < 2; ++i) {
- for (j = 85; j < 140; ++j) {
- memset(data2,0,1024);
- memset(data3,0,1024);
- p = (i==0)?PK_PKCS1_PADDING:PK_PKCS1_OAEP_PADDING;
- len = crypto_pk_public_hybrid_encrypt(pk1,data2,sizeof(data2),
- data1,j,p,0);
- test_assert(len>=0);
- len = crypto_pk_private_hybrid_decrypt(pk1,data3,sizeof(data3),
- data2,len,p,1);
- test_eq(len,j);
- test_memeq(data1,data3,j);
- }
+ for (i = 85; i < 140; ++i) {
+ memset(data2,0,1024);
+ memset(data3,0,1024);
+ len = crypto_pk_public_hybrid_encrypt(pk1,data2,sizeof(data2),
+ data1,i,PK_PKCS1_OAEP_PADDING,0);
+ test_assert(len>=0);
+ len = crypto_pk_private_hybrid_decrypt(pk1,data3,sizeof(data3),
+ data2,len,PK_PKCS1_OAEP_PADDING,1);
+ test_eq(len,i);
+ test_memeq(data1,data3,i);
}
/* Try copy_full */