diff options
| author | Nick Mathewson <nickm@torproject.org> | 2004-05-12 19:30:28 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2004-05-12 19:30:28 +0000 |
| commit | 9c3fba5c3bd654d42f8f539e7e8d3caa17861ea0 (patch) | |
| tree | 8be34d36a5953a36925b92b9326ccb281873dfee /src/or | |
| parent | f1bc7af9f54bb4b563ffa024b1e32a6acacef26f (diff) | |
| download | tor-9c3fba5c3bd654d42f8f539e7e8d3caa17861ea0.tar.gz tor-9c3fba5c3bd654d42f8f539e7e8d3caa17861ea0.zip | |
Not every RSA decrypt should warn on failure.
svn:r1853
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/onion.c | 4 | ||||
| -rw-r--r-- | src/or/rendservice.c | 2 | ||||
| -rw-r--r-- | src/or/test.c | 12 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/or/onion.c b/src/or/onion.c index fa496421c0..adaab58c48 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -728,12 +728,12 @@ onion_skin_server_handshake(char *onion_skin, /* ONIONSKIN_CHALLENGE_LEN bytes * break; len = crypto_pk_private_hybrid_decrypt(k, onion_skin, ONIONSKIN_CHALLENGE_LEN, - challenge, PK_PKCS1_OAEP_PADDING); + challenge, PK_PKCS1_OAEP_PADDING,0); if (len>0) break; } if (len<0) { - log_fn(LOG_WARN, "Couldn't decrypt onionskin"); + log_fn(LOG_WARN, "Couldn't decrypt onionskin: client may be using old onion key"); goto err; } else if (len != DH_KEY_LEN) { log_fn(LOG_WARN, "Unexpected onionskin length after decryption: %d", diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 2106853974..db114ad283 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -388,7 +388,7 @@ rend_service_introduce(circuit_t *circuit, const char *request, int request_len) /* Next N bytes is encrypted with service key */ len = crypto_pk_private_hybrid_decrypt( service->private_key,request+DIGEST_LEN,request_len-DIGEST_LEN,buf, - PK_PKCS1_OAEP_PADDING); + PK_PKCS1_OAEP_PADDING,1); if (len<0) { log_fn(LOG_WARN, "Couldn't decrypt INTRODUCE2 cell"); return -1; diff --git a/src/or/test.c b/src/or/test.c index d0b5fcdcce..864645b5d0 100644 --- a/src/or/test.c +++ b/src/or/test.c @@ -333,19 +333,19 @@ test_crypto() /* oaep padding should make encryption not match */ test_memneq(data1, data2, 128); test_eq(15, crypto_pk_private_decrypt(pk1, data1, 128, data3, - PK_PKCS1_OAEP_PADDING)); + PK_PKCS1_OAEP_PADDING,1)); test_streq(data3, "Hello whirled."); memset(data3, 0, 1024); test_eq(15, crypto_pk_private_decrypt(pk1, data2, 128, data3, - PK_PKCS1_OAEP_PADDING)); + PK_PKCS1_OAEP_PADDING,1)); test_streq(data3, "Hello whirled."); /* Can't decrypt with public key. */ test_eq(-1, crypto_pk_private_decrypt(pk2, data2, 128, data3, - PK_PKCS1_OAEP_PADDING)); + PK_PKCS1_OAEP_PADDING,1)); /* Try again with bad padding */ memcpy(data2+1, "XYZZY", 5); /* This has fails ~ once-in-2^40 */ test_eq(-1, crypto_pk_private_decrypt(pk1, data2, 128, data3, - PK_PKCS1_OAEP_PADDING)); + PK_PKCS1_OAEP_PADDING,1)); /* File operations: save and load private key */ test_assert(! crypto_pk_write_private_key_to_filename(pk1, @@ -354,7 +354,7 @@ test_crypto() test_assert(! crypto_pk_read_private_key_from_filename(pk2, "/tmp/tor_test/pke1y")); test_eq(15, crypto_pk_private_decrypt(pk2, data1, 128, data3, - PK_PKCS1_OAEP_PADDING)); + PK_PKCS1_OAEP_PADDING,1)); /* Now try signing. */ strcpy(data1, "Ossifrage"); @@ -388,7 +388,7 @@ test_crypto() (i==1)?PK_PKCS1_PADDING:PK_PKCS1_OAEP_PADDING; len = crypto_pk_public_hybrid_encrypt(pk1,data1,j,data2,p,0); test_assert(len>=0); - len = crypto_pk_private_hybrid_decrypt(pk1,data2,len,data3,p); + len = crypto_pk_private_hybrid_decrypt(pk1,data2,len,data3,p,1); test_eq(len,j); test_memeq(data1,data3,j); } |