TLS/SSL and crypto library
Revision | 55e81315dc56e80805e6c75ce695aba4aea31182 (tree) |
---|---|
Zeit | 2004-05-07 00:36:28 |
Autor | Ben Laurie <ben@open...> |
Commiter | Ben Laurie |
Fix selftest.
@@ -1,3 +1,3 @@ | ||
1 | 1 | HMAC-SHA1(fips_rsa_eay.c)= 3808fed15de958768052db96ff710699ca9afd92 |
2 | -HMAC-SHA1(fips_rsa_gen.c)= f0c9424afae306f47aa8f941c80d51d5612896e3 | |
2 | +HMAC-SHA1(fips_rsa_gen.c)= 0f7eec6b217844f638902ff82fe41e2201ade1d5 | |
3 | 3 | HMAC-SHA1(fips_rsa_selftest.c)= af5b9c9a0237b2219f375849a5b2311d786e711b |
@@ -71,18 +71,14 @@ static int fips_check_rsa(RSA *rsa) | ||
71 | 71 | int n; |
72 | 72 | unsigned char ctext[256]; |
73 | 73 | unsigned char ptext[256]; |
74 | + /* The longest we can have with OAEP padding and a 512 bit key */ | |
74 | 75 | static unsigned char original_ptext[] = |
75 | 76 | "\x01\x23\x45\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0" |
76 | - "\x23\x45\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12" | |
77 | - "\x45\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34" | |
78 | - "\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34\x56" | |
79 | - "\x01\x23\x45\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0" | |
80 | - "\x23\x45\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12" | |
81 | - "\x45\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34" | |
82 | - "\x67\x89\xab\xcd\xef\x12\x34\x56\x78\x9a\xbc\xde\xf0\x12\x34\x56"; | |
77 | + "\x23\x45\x67\x89\xab\xcd"; | |
83 | 78 | |
79 | + /* this will fail for keys shorter than 512 bits */ | |
84 | 80 | n=RSA_public_encrypt(sizeof(original_ptext)-1,original_ptext,ctext,rsa, |
85 | - RSA_NO_PADDING); | |
81 | + RSA_PKCS1_OAEP_PADDING); | |
86 | 82 | if(n < 0) |
87 | 83 | { |
88 | 84 | ERR_print_errors_fp(stderr); |
@@ -93,7 +89,7 @@ static int fips_check_rsa(RSA *rsa) | ||
93 | 89 | FIPSerr(FIPS_F_FIPS_CHECK_RSA,FIPS_R_PAIRWISE_TEST_FAILED); |
94 | 90 | return 0; |
95 | 91 | } |
96 | - n=RSA_private_decrypt(n,ctext,ptext,rsa,RSA_NO_PADDING); | |
92 | + n=RSA_private_decrypt(n,ctext,ptext,rsa,RSA_PKCS1_OAEP_PADDING); | |
97 | 93 | if(n < 0) |
98 | 94 | { |
99 | 95 | ERR_print_errors_fp(stderr); |