diff options
author | Adam Langley <agl@google.com> | 2015-05-11 17:20:37 -0700 |
---|---|---|
committer | Kenny Root <kroot@google.com> | 2015-05-12 23:06:14 +0000 |
commit | e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5 (patch) | |
tree | 6e43e34595ecf887c26c32b86d8ab097fe8cac64 /src/crypto/rsa/rsa_test.c | |
parent | b3106a0cc1493bbe0505c0ec0ce3da4ca90a29ae (diff) | |
download | external_boringssl-e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5.zip external_boringssl-e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5.tar.gz external_boringssl-e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5.tar.bz2 |
external/boringssl: bump revision.
This change bumps the BoringSSL revision to the current tip-of-tree.
Change-Id: I91d5bf467e16e8d86cb19a4de873985f524e5faa
Diffstat (limited to 'src/crypto/rsa/rsa_test.c')
-rw-r--r-- | src/crypto/rsa/rsa_test.c | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/src/crypto/rsa/rsa_test.c b/src/crypto/rsa/rsa_test.c index 75489e0..318cf3f 100644 --- a/src/crypto/rsa/rsa_test.c +++ b/src/crypto/rsa/rsa_test.c @@ -56,9 +56,9 @@ #include <openssl/rsa.h> +#include <stdlib.h> #include <string.h> -#include <openssl/bio.h> #include <openssl/bn.h> #include <openssl/crypto.h> #include <openssl/err.h> @@ -249,13 +249,13 @@ static int test_bad_key(void) { if (!RSA_generate_key_ex(key, 512, &e, NULL)) { fprintf(stderr, "RSA_generate_key_ex failed.\n"); - BIO_print_errors_fp(stderr); + ERR_print_errors_fp(stderr); return 0; } if (!BN_add(key->p, key->p, BN_value_one())) { fprintf(stderr, "BN error.\n"); - BIO_print_errors_fp(stderr); + ERR_print_errors_fp(stderr); return 0; } @@ -292,19 +292,21 @@ static int test_only_d_given(void) { if (!RSA_check_key(key)) { fprintf(stderr, "RSA_check_key failed with only d given.\n"); - BIO_print_errors_fp(stderr); + ERR_print_errors_fp(stderr); goto err; } - if (!RSA_sign(NID_md5, kDummyHash, sizeof(kDummyHash), buf, &buf_len, key)) { + if (!RSA_sign(NID_sha256, kDummyHash, sizeof(kDummyHash), buf, &buf_len, + key)) { fprintf(stderr, "RSA_sign failed with only d given.\n"); - BIO_print_errors_fp(stderr); + ERR_print_errors_fp(stderr); goto err; } - if (!RSA_verify(NID_md5, kDummyHash, sizeof(kDummyHash), buf, buf_len, key)) { + if (!RSA_verify(NID_sha256, kDummyHash, sizeof(kDummyHash), buf, buf_len, + key)) { fprintf(stderr, "RSA_verify failed with only d given.\n"); - BIO_print_errors_fp(stderr); + ERR_print_errors_fp(stderr); goto err; } @@ -331,13 +333,13 @@ static int test_recover_crt_params(void) { key1 = RSA_new(); if (!RSA_generate_key_ex(key1, 512, e, NULL)) { fprintf(stderr, "RSA_generate_key_ex failed.\n"); - BIO_print_errors_fp(stderr); + ERR_print_errors_fp(stderr); return 0; } if (!RSA_check_key(key1)) { fprintf(stderr, "RSA_check_key failed with original key.\n"); - BIO_print_errors_fp(stderr); + ERR_print_errors_fp(stderr); return 0; } @@ -349,7 +351,7 @@ static int test_recover_crt_params(void) { if (!RSA_recover_crt_params(key2)) { fprintf(stderr, "RSA_recover_crt_params failed.\n"); - BIO_print_errors_fp(stderr); + ERR_print_errors_fp(stderr); return 0; } @@ -359,21 +361,21 @@ static int test_recover_crt_params(void) { if (!RSA_check_key(key2)) { fprintf(stderr, "RSA_check_key failed with recovered key.\n"); - BIO_print_errors_fp(stderr); + ERR_print_errors_fp(stderr); return 0; } - if (!RSA_sign(NID_md5, kDummyHash, sizeof(kDummyHash), buf, &buf_len, + if (!RSA_sign(NID_sha256, kDummyHash, sizeof(kDummyHash), buf, &buf_len, key2)) { fprintf(stderr, "RSA_sign failed with recovered key.\n"); - BIO_print_errors_fp(stderr); + ERR_print_errors_fp(stderr); return 0; } - if (!RSA_verify(NID_md5, kDummyHash, sizeof(kDummyHash), buf, buf_len, + if (!RSA_verify(NID_sha256, kDummyHash, sizeof(kDummyHash), buf, buf_len, key2)) { fprintf(stderr, "RSA_verify failed with recovered key.\n"); - BIO_print_errors_fp(stderr); + ERR_print_errors_fp(stderr); return 0; } @@ -478,8 +480,9 @@ int main(int argc, char *argv[]) { int b; unsigned char saved = ctext[n]; for (b = 0; b < 256; ++b) { - if (b == saved) + if (b == saved) { continue; + } ctext[n] = b; num = RSA_private_decrypt(num, ctext, ptext, key, RSA_PKCS1_OAEP_PADDING); |