Refactored RSA to have random generator in every RSA operation
Primarily so that rsa_private() receives an RNG for blinding purposes.
diff --git a/ChangeLog b/ChangeLog
index 6cfdd00..ba40102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,7 @@
* Renamed error_strerror() to the less conflicting polarssl_strerror()
(Ability to keep old as well with POLARSSL_ERROR_STRERROR_BC)
* SHA2 renamed to SHA256, SHA4 renamed to SHA512 and functions accordingly
+ * All RSA operations require a random generator for blinding purposes
Bugfix
* Fixed parse error in ssl_parse_certificate_request()
diff --git a/include/polarssl/rsa.h b/include/polarssl/rsa.h
index 90cfd55..5bc6881 100644
--- a/include/polarssl/rsa.h
+++ b/include/polarssl/rsa.h
@@ -176,6 +176,8 @@
* \brief Do an RSA private key operation
*
* \param ctx RSA context
+ * \param f_rng RNG function (Needed for blinding)
+ * \param p_rng RNG parameter
* \param input input buffer
* \param output output buffer
*
@@ -185,6 +187,8 @@
* enough (eg. 128 bytes if RSA-1024 is used).
*/
int rsa_private( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
const unsigned char *input,
unsigned char *output );
@@ -194,7 +198,8 @@
* RSA operation.
*
* \param ctx RSA context
- * \param f_rng RNG function (Needed for padding and PKCS#1 v2.1 encoding)
+ * \param f_rng RNG function (Needed for padding and PKCS#1 v2.1 encoding
+ * and RSA_PRIVATE)
* \param p_rng RNG parameter
* \param mode RSA_PUBLIC or RSA_PRIVATE
* \param ilen contains the plaintext length
@@ -217,7 +222,7 @@
* \brief Perform a PKCS#1 v1.5 encryption (RSAES-PKCS1-v1_5-ENCRYPT)
*
* \param ctx RSA context
- * \param f_rng RNG function (Needed for padding)
+ * \param f_rng RNG function (Needed for padding and RSA_PRIVATE)
* \param p_rng RNG parameter
* \param mode RSA_PUBLIC or RSA_PRIVATE
* \param ilen contains the plaintext length
@@ -240,7 +245,8 @@
* \brief Perform a PKCS#1 v2.1 OAEP encryption (RSAES-OAEP-ENCRYPT)
*
* \param ctx RSA context
- * \param f_rng RNG function (Needed for padding and PKCS#1 v2.1 encoding)
+ * \param f_rng RNG function (Needed for padding and PKCS#1 v2.1 encoding
+ * and RSA_PRIVATE)
* \param p_rng RNG parameter
* \param mode RSA_PUBLIC or RSA_PRIVATE
* \param label buffer holding the custom label to use
@@ -269,6 +275,8 @@
* the message padding
*
* \param ctx RSA context
+ * \param f_rng RNG function (Only required for RSA_PRIVATE)
+ * \param p_rng RNG parameter
* \param mode RSA_PUBLIC or RSA_PRIVATE
* \param olen will contain the plaintext length
* \param input buffer holding the encrypted data
@@ -282,6 +290,8 @@
* an error is thrown.
*/
int rsa_pkcs1_decrypt( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
int mode, size_t *olen,
const unsigned char *input,
unsigned char *output,
@@ -291,6 +301,8 @@
* \brief Perform a PKCS#1 v1.5 decryption (RSAES-PKCS1-v1_5-DECRYPT)
*
* \param ctx RSA context
+ * \param f_rng RNG function (Only required for RSA_PRIVATE)
+ * \param p_rng RNG parameter
* \param mode RSA_PUBLIC or RSA_PRIVATE
* \param olen will contain the plaintext length
* \param input buffer holding the encrypted data
@@ -304,6 +316,8 @@
* an error is thrown.
*/
int rsa_rsaes_pkcs1_v15_decrypt( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
int mode, size_t *olen,
const unsigned char *input,
unsigned char *output,
@@ -313,6 +327,8 @@
* \brief Perform a PKCS#1 v2.1 OAEP decryption (RSAES-OAEP-DECRYPT)
*
* \param ctx RSA context
+ * \param f_rng RNG function (Only required for RSA_PRIVATE)
+ * \param p_rng RNG parameter
* \param mode RSA_PUBLIC or RSA_PRIVATE
* \param label buffer holding the custom label to use
* \param label_len contains the label length
@@ -328,6 +344,8 @@
* an error is thrown.
*/
int rsa_rsaes_oaep_decrypt( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
int mode,
const unsigned char *label, size_t label_len,
size_t *olen,
@@ -341,7 +359,8 @@
* a message digest
*
* \param ctx RSA context
- * \param f_rng RNG function (Needed for PKCS#1 v2.1 encoding)
+ * \param f_rng RNG function (Needed for PKCS#1 v2.1 encoding and for
+ * RSA_PRIVATE)
* \param p_rng RNG parameter
* \param mode RSA_PUBLIC or RSA_PRIVATE
* \param md_alg a POLARSSL_MD_* (use POLARSSL_MD_NONE for signing raw data)
@@ -374,6 +393,8 @@
* \brief Perform a PKCS#1 v1.5 signature (RSASSA-PKCS1-v1_5-SIGN)
*
* \param ctx RSA context
+ * \param f_rng RNG function (Only required for RSA_PRIVATE)
+ * \param p_rng RNG parameter
* \param mode RSA_PUBLIC or RSA_PRIVATE
* \param md_alg a POLARSSL_MD_* (use POLARSSL_MD_NONE for signing raw data)
* \param hashlen message digest length (for POLARSSL_MD_NONE only)
@@ -387,6 +408,8 @@
* of ctx->N (eg. 128 bytes if RSA-1024 is used).
*/
int rsa_rsassa_pkcs1_v15_sign( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
int mode,
md_type_t md_alg,
unsigned int hashlen,
@@ -397,7 +420,8 @@
* \brief Perform a PKCS#1 v2.1 PSS signature (RSASSA-PSS-SIGN)
*
* \param ctx RSA context
- * \param f_rng RNG function (Needed for PKCS#1 v2.1 encoding)
+ * \param f_rng RNG function (Needed for PKCS#1 v2.1 encoding and for
+ * RSA_PRIVATE)
* \param p_rng RNG parameter
* \param mode RSA_PUBLIC or RSA_PRIVATE
* \param md_alg a POLARSSL_MD_* (use POLARSSL_MD_NONE for signing raw data)
@@ -432,6 +456,8 @@
* the message digest
*
* \param ctx points to an RSA public key
+ * \param f_rng RNG function (Only required for RSA_PRIVATE)
+ * \param p_rng RNG parameter
* \param mode RSA_PUBLIC or RSA_PRIVATE
* \param md_alg a POLARSSL_MD_* (use POLARSSL_MD_NONE for signing raw data)
* \param hashlen message digest length (for POLARSSL_MD_NONE only)
@@ -451,6 +477,8 @@
* keep both hashes the same.
*/
int rsa_pkcs1_verify( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
int mode,
md_type_t md_alg,
unsigned int hashlen,
@@ -461,6 +489,8 @@
* \brief Perform a PKCS#1 v1.5 verification (RSASSA-PKCS1-v1_5-VERIFY)
*
* \param ctx points to an RSA public key
+ * \param f_rng RNG function (Only required for RSA_PRIVATE)
+ * \param p_rng RNG parameter
* \param mode RSA_PUBLIC or RSA_PRIVATE
* \param md_alg a POLARSSL_MD_* (use POLARSSL_MD_NONE for signing raw data)
* \param hashlen message digest length (for POLARSSL_MD_NONE only)
@@ -474,6 +504,8 @@
* of ctx->N (eg. 128 bytes if RSA-1024 is used).
*/
int rsa_rsassa_pkcs1_v15_verify( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
int mode,
md_type_t md_alg,
unsigned int hashlen,
@@ -485,6 +517,8 @@
* \brief Do a public RSA and check the message digest
*
* \param ctx points to an RSA public key
+ * \param f_rng RNG function (Only required for RSA_PRIVATE)
+ * \param p_rng RNG parameter
* \param mode RSA_PUBLIC or RSA_PRIVATE
* \param md_alg a POLARSSL_MD_* (use POLARSSL_MD_NONE for signing raw data)
* \param hashlen message digest length (for POLARSSL_MD_NONE only)
@@ -504,6 +538,8 @@
* keep both hashes the same.
*/
int rsa_rsassa_pss_verify( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
int mode,
md_type_t md_alg,
unsigned int hashlen,
diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index 94f5282..a26bc08 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -67,7 +67,7 @@
if( sig_len != ((rsa_context *) ctx)->len )
return( POLARSSL_ERR_RSA_VERIFY_FAILED );
- return( rsa_pkcs1_verify( (rsa_context *) ctx,
+ return( rsa_pkcs1_verify( (rsa_context *) ctx, NULL, NULL,
RSA_PUBLIC, md_alg, hash_len, hash, sig ) );
}
@@ -87,13 +87,10 @@
unsigned char *output, size_t *olen, size_t osize,
int (*f_rng)(void *, unsigned char *, size_t), void *p_rng )
{
- ((void) f_rng);
- ((void) p_rng);
-
if( ilen != ((rsa_context *) ctx)->len )
return( POLARSSL_ERR_RSA_BAD_INPUT_DATA );
- return( rsa_pkcs1_decrypt( (rsa_context *) ctx,
+ return( rsa_pkcs1_decrypt( (rsa_context *) ctx, f_rng, p_rng,
RSA_PRIVATE, olen, input, output, osize ) );
}
diff --git a/library/rsa.c b/library/rsa.c
index ccdd048..2cb3742 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -257,12 +257,16 @@
* Do an RSA private key operation
*/
int rsa_private( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
const unsigned char *input,
unsigned char *output )
{
int ret;
size_t olen;
mpi T, T1, T2;
+ ((void) f_rng);
+ ((void) p_rng);
mpi_init( &T ); mpi_init( &T1 ); mpi_init( &T2 );
@@ -430,7 +434,7 @@
return( ( mode == RSA_PUBLIC )
? rsa_public( ctx, output, output )
- : rsa_private( ctx, output, output ) );
+ : rsa_private( ctx, f_rng, p_rng, output, output ) );
}
#endif /* POLARSSL_PKCS1_V21 */
@@ -492,7 +496,7 @@
return( ( mode == RSA_PUBLIC )
? rsa_public( ctx, output, output )
- : rsa_private( ctx, output, output ) );
+ : rsa_private( ctx, f_rng, p_rng, output, output ) );
}
/*
@@ -527,7 +531,9 @@
* Implementation of the PKCS#1 v2.1 RSAES-OAEP-DECRYPT function
*/
int rsa_rsaes_oaep_decrypt( rsa_context *ctx,
- int mode,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
+ int mode,
const unsigned char *label, size_t label_len,
size_t *olen,
const unsigned char *input,
@@ -553,7 +559,7 @@
ret = ( mode == RSA_PUBLIC )
? rsa_public( ctx, input, buf )
- : rsa_private( ctx, input, buf );
+ : rsa_private( ctx, f_rng, p_rng, input, buf );
if( ret != 0 )
return( ret );
@@ -618,6 +624,8 @@
* Implementation of the PKCS#1 v2.1 RSAES-PKCS1-V1_5-DECRYPT function
*/
int rsa_rsaes_pkcs1_v15_decrypt( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
int mode, size_t *olen,
const unsigned char *input,
unsigned char *output,
@@ -639,7 +647,7 @@
ret = ( mode == RSA_PUBLIC )
? rsa_public( ctx, input, buf )
- : rsa_private( ctx, input, buf );
+ : rsa_private( ctx, f_rng, p_rng, input, buf );
if( ret != 0 )
return( ret );
@@ -711,6 +719,8 @@
* Do an RSA operation, then remove the message padding
*/
int rsa_pkcs1_decrypt( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
int mode, size_t *olen,
const unsigned char *input,
unsigned char *output,
@@ -719,13 +729,14 @@
switch( ctx->padding )
{
case RSA_PKCS_V15:
- return rsa_rsaes_pkcs1_v15_decrypt( ctx, mode, olen, input, output,
- output_max_len );
+ return rsa_rsaes_pkcs1_v15_decrypt( ctx, f_rng, p_rng, mode, olen,
+ input, output, output_max_len );
#if defined(POLARSSL_PKCS1_V21)
case RSA_PKCS_V21:
- return rsa_rsaes_oaep_decrypt( ctx, mode, NULL, 0, olen, input,
- output, output_max_len );
+ return rsa_rsaes_oaep_decrypt( ctx, f_rng, p_rng, mode, NULL, 0,
+ olen, input, output,
+ output_max_len );
#endif
default:
@@ -827,7 +838,7 @@
return( ( mode == RSA_PUBLIC )
? rsa_public( ctx, sig, sig )
- : rsa_private( ctx, sig, sig ) );
+ : rsa_private( ctx, f_rng, p_rng, sig, sig ) );
}
#endif /* POLARSSL_PKCS1_V21 */
@@ -838,6 +849,8 @@
* Do an RSA operation to sign the message digest
*/
int rsa_rsassa_pkcs1_v15_sign( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
int mode,
md_type_t md_alg,
unsigned int hashlen,
@@ -912,7 +925,7 @@
return( ( mode == RSA_PUBLIC )
? rsa_public( ctx, sig, sig )
- : rsa_private( ctx, sig, sig ) );
+ : rsa_private( ctx, f_rng, p_rng, sig, sig ) );
}
/*
@@ -930,7 +943,7 @@
switch( ctx->padding )
{
case RSA_PKCS_V15:
- return rsa_rsassa_pkcs1_v15_sign( ctx, mode, md_alg,
+ return rsa_rsassa_pkcs1_v15_sign( ctx, f_rng, p_rng, mode, md_alg,
hashlen, hash, sig );
#if defined(POLARSSL_PKCS1_V21)
@@ -949,6 +962,8 @@
* Implementation of the PKCS#1 v2.1 RSASSA-PSS-VERIFY function
*/
int rsa_rsassa_pss_verify( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
int mode,
md_type_t md_alg,
unsigned int hashlen,
@@ -976,7 +991,7 @@
ret = ( mode == RSA_PUBLIC )
? rsa_public( ctx, sig, buf )
- : rsa_private( ctx, sig, buf );
+ : rsa_private( ctx, f_rng, p_rng, sig, buf );
if( ret != 0 )
return( ret );
@@ -1059,6 +1074,8 @@
* Implementation of the PKCS#1 v2.1 RSASSA-PKCS1-v1_5-VERIFY function
*/
int rsa_rsassa_pkcs1_v15_verify( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
int mode,
md_type_t md_alg,
unsigned int hashlen,
@@ -1083,7 +1100,7 @@
ret = ( mode == RSA_PUBLIC )
? rsa_public( ctx, sig, buf )
- : rsa_private( ctx, sig, buf );
+ : rsa_private( ctx, f_rng, p_rng, sig, buf );
if( ret != 0 )
return( ret );
@@ -1173,6 +1190,8 @@
* Do an RSA operation and check the message digest
*/
int rsa_pkcs1_verify( rsa_context *ctx,
+ int (*f_rng)(void *, unsigned char *, size_t),
+ void *p_rng,
int mode,
md_type_t md_alg,
unsigned int hashlen,
@@ -1182,12 +1201,12 @@
switch( ctx->padding )
{
case RSA_PKCS_V15:
- return rsa_rsassa_pkcs1_v15_verify( ctx, mode, md_alg,
+ return rsa_rsassa_pkcs1_v15_verify( ctx, f_rng, p_rng, mode, md_alg,
hashlen, hash, sig );
#if defined(POLARSSL_PKCS1_V21)
case RSA_PKCS_V21:
- return rsa_rsassa_pss_verify( ctx, mode, md_alg,
+ return rsa_rsassa_pss_verify( ctx, f_rng, p_rng, mode, md_alg,
hashlen, hash, sig );
#endif
@@ -1355,7 +1374,7 @@
memcpy( rsa_plaintext, RSA_PT, PT_LEN );
- if( rsa_pkcs1_encrypt( &rsa, &myrand, NULL, RSA_PUBLIC, PT_LEN,
+ if( rsa_pkcs1_encrypt( &rsa, myrand, NULL, RSA_PUBLIC, PT_LEN,
rsa_plaintext, rsa_ciphertext ) != 0 )
{
if( verbose != 0 )
@@ -1367,7 +1386,7 @@
if( verbose != 0 )
printf( "passed\n PKCS#1 decryption : " );
- if( rsa_pkcs1_decrypt( &rsa, RSA_PRIVATE, &len,
+ if( rsa_pkcs1_decrypt( &rsa, myrand, NULL, RSA_PRIVATE, &len,
rsa_ciphertext, rsa_decrypted,
sizeof(rsa_decrypted) ) != 0 )
{
@@ -1403,7 +1422,7 @@
if( verbose != 0 )
printf( "passed\n PKCS#1 sig. verify: " );
- if( rsa_pkcs1_verify( &rsa, RSA_PUBLIC, POLARSSL_MD_SHA1, 0,
+ if( rsa_pkcs1_verify( &rsa, NULL, NULL, RSA_PUBLIC, POLARSSL_MD_SHA1, 0,
sha1sum, rsa_ciphertext ) != 0 )
{
if( verbose != 0 )
diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c
index 34956b8..f06b906 100644
--- a/programs/pkey/dh_client.c
+++ b/programs/pkey/dh_client.c
@@ -205,8 +205,8 @@
sha1( buf, (int)( p - 2 - buf ), hash );
- if( ( ret = rsa_pkcs1_verify( &rsa, RSA_PUBLIC, POLARSSL_MD_SHA1,
- 0, hash, p ) ) != 0 )
+ if( ( ret = rsa_pkcs1_verify( &rsa, NULL, NULL, RSA_PUBLIC,
+ POLARSSL_MD_SHA1, 0, hash, p ) ) != 0 )
{
printf( " failed\n ! rsa_pkcs1_verify returned %d\n\n", ret );
goto exit;
diff --git a/programs/pkey/rsa_decrypt.c b/programs/pkey/rsa_decrypt.c
index 0b168f4..4ecb613 100644
--- a/programs/pkey/rsa_decrypt.c
+++ b/programs/pkey/rsa_decrypt.c
@@ -33,16 +33,20 @@
#include "polarssl/config.h"
#include "polarssl/rsa.h"
+#include "polarssl/entropy.h"
+#include "polarssl/ctr_drbg.h"
#if !defined(POLARSSL_BIGNUM_C) || !defined(POLARSSL_RSA_C) || \
- !defined(POLARSSL_FS_IO)
+ !defined(POLARSSL_FS_IO) || !defined(POLARSSL_ENTROPY_C) || \
+ !defined(POLARSSL_CTR_DRBG_C)
int main( int argc, char *argv[] )
{
((void) argc);
((void) argv);
printf("POLARSSL_BIGNUM_C and/or POLARSSL_RSA_C and/or "
- "POLARSSL_FS_IO not defined.\n");
+ "POLARSSL_FS_IO and/or POLARSSL_ENTROPY_C and/or "
+ "POLARSSL_CTR_DRBG_C not defined.\n");
return( 0 );
}
#else
@@ -52,8 +56,11 @@
int ret, c;
size_t i;
rsa_context rsa;
+ entropy_context entropy;
+ ctr_drbg_context ctr_drbg;
unsigned char result[1024];
unsigned char buf[512];
+ const char *pers = "rsa_decrypt";
((void) argv);
memset(result, 0, sizeof( result ) );
@@ -70,6 +77,18 @@
goto exit;
}
+ printf( "\n . Seeding the random number generator..." );
+ fflush( stdout );
+
+ entropy_init( &entropy );
+ if( ( ret = ctr_drbg_init( &ctr_drbg, entropy_func, &entropy,
+ (const unsigned char *) pers,
+ strlen( pers ) ) ) != 0 )
+ {
+ printf( " failed\n ! ctr_drbg_init returned %d\n", ret );
+ goto exit;
+ }
+
printf( "\n . Reading private key from rsa_priv.txt" );
fflush( stdout );
@@ -130,7 +149,8 @@
printf( "\n . Decrypting the encrypted data" );
fflush( stdout );
- if( ( ret = rsa_pkcs1_decrypt( &rsa, RSA_PRIVATE, &i, buf, result,
+ if( ( ret = rsa_pkcs1_decrypt( &rsa, ctr_drbg_random, &ctr_drbg,
+ RSA_PRIVATE, &i, buf, result,
1024 ) ) != 0 )
{
printf( " failed\n ! rsa_pkcs1_decrypt returned %d\n\n", ret );
diff --git a/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c
index 126ea4d..4a54f64 100644
--- a/programs/pkey/rsa_verify.c
+++ b/programs/pkey/rsa_verify.c
@@ -131,8 +131,8 @@
goto exit;
}
- if( ( ret = rsa_pkcs1_verify( &rsa, RSA_PUBLIC, POLARSSL_MD_SHA1,
- 20, hash, buf ) ) != 0 )
+ if( ( ret = rsa_pkcs1_verify( &rsa, NULL, NULL, RSA_PUBLIC,
+ POLARSSL_MD_SHA1, 20, hash, buf ) ) != 0 )
{
printf( " failed\n ! rsa_pkcs1_verify returned -0x%0x\n\n", -ret );
goto exit;
diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c
index 00d7378..b243772 100644
--- a/programs/pkey/rsa_verify_pss.c
+++ b/programs/pkey/rsa_verify_pss.c
@@ -124,8 +124,8 @@
goto exit;
}
- if( ( ret = rsa_pkcs1_verify( &rsa, RSA_PUBLIC, POLARSSL_MD_SHA1,
- 20, hash, buf ) ) != 0 )
+ if( ( ret = rsa_pkcs1_verify( &rsa, NULL, NULL, RSA_PUBLIC,
+ POLARSSL_MD_SHA1, 20, hash, buf ) ) != 0 )
{
printf( " failed\n ! rsa_pkcs1_verify returned %d\n\n", ret );
goto exit;
diff --git a/programs/test/o_p_test.c b/programs/test/o_p_test.c
index 84dd38b..8944940 100644
--- a/programs/test/o_p_test.c
+++ b/programs/test/o_p_test.c
@@ -197,7 +197,7 @@
printf( " . Generating the RSA decrypted value for OpenSSL (PUBLIC) with PolarSSL (PRIVATE) ..." );
fflush( stdout );
- if( ( ret = rsa_pkcs1_decrypt( &p_rsa, RSA_PRIVATE, &olen, o_pub_encrypted, p_pub_decrypted, 1024 ) ) != 0 )
+ if( ( ret = rsa_pkcs1_decrypt( &p_rsa, ctr_drbg_random, &ctr_drbg, RSA_PRIVATE, &olen, o_pub_encrypted, p_pub_decrypted, 1024 ) ) != 0 )
{
printf( " failed\n ! rsa_pkcs1_decrypt returned %d\n\n", ret );
}
@@ -221,7 +221,7 @@
printf( " . Generating the RSA decrypted value for OpenSSL (PRIVATE) with PolarSSL (PUBLIC) ..." );
fflush( stdout );
- if( ( ret = rsa_pkcs1_decrypt( &p_rsa, RSA_PUBLIC, &olen, o_priv_encrypted, p_priv_decrypted, 1024 ) ) != 0 )
+ if( ( ret = rsa_pkcs1_decrypt( &p_rsa, NULL, NULL, RSA_PUBLIC, &olen, o_priv_encrypted, p_priv_decrypted, 1024 ) ) != 0 )
{
printf( " failed\n ! rsa_pkcs1_decrypt returned %d\n\n", ret );
}
diff --git a/tests/suites/test_suite_pkcs1_v21.function b/tests/suites/test_suite_pkcs1_v21.function
index 21ef421..c4c7b35 100644
--- a/tests/suites/test_suite_pkcs1_v21.function
+++ b/tests/suites/test_suite_pkcs1_v21.function
@@ -69,6 +69,7 @@
rsa_context ctx;
mpi P1, Q1, H, G;
size_t output_len;
+ rnd_pseudo_info rnd_info;
((void) seed);
mpi_init( &P1 ); mpi_init( &Q1 ); mpi_init( &H ); mpi_init( &G );
@@ -77,13 +78,14 @@
memset( message_str, 0x00, 1000 );
memset( output, 0x00, 1000 );
memset( output_str, 0x00, 1000 );
+ memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
ctx.len = mod / 8 + ( ( mod % 8 ) ? 1 : 0 );
TEST_ASSERT( mpi_read_string( &ctx.P, radix_P, input_P ) == 0 );
TEST_ASSERT( mpi_read_string( &ctx.Q, radix_Q, input_Q ) == 0 );
TEST_ASSERT( mpi_read_string( &ctx.N, radix_N, input_N ) == 0 );
TEST_ASSERT( mpi_read_string( &ctx.E, radix_E, input_E ) == 0 );
-
+
TEST_ASSERT( mpi_sub_int( &P1, &ctx.P, 1 ) == 0 );
TEST_ASSERT( mpi_sub_int( &Q1, &ctx.Q, 1 ) == 0 );
TEST_ASSERT( mpi_mul_mpi( &H, &P1, &Q1 ) == 0 );
@@ -97,7 +99,7 @@
unhexify( message_str, message_hex_string );
- TEST_ASSERT( rsa_pkcs1_decrypt( &ctx, RSA_PRIVATE, &output_len, message_str, output, 1000 ) == result );
+ TEST_ASSERT( rsa_pkcs1_decrypt( &ctx, &rnd_pseudo_rand, &rnd_info, RSA_PRIVATE, &output_len, message_str, output, 1000 ) == result );
if( result == 0 )
{
hexify( output_str, output, ctx.len );
@@ -203,7 +205,7 @@
if( md_info_from_type( digest ) != NULL )
TEST_ASSERT( md( md_info_from_type( digest ), message_str, msg_len, hash_result ) == 0 );
- TEST_ASSERT( rsa_pkcs1_verify( &ctx, RSA_PUBLIC, digest, 0, hash_result, result_str ) == result );
+ TEST_ASSERT( rsa_pkcs1_verify( &ctx, NULL, NULL, RSA_PUBLIC, digest, 0, hash_result, result_str ) == result );
rsa_free( &ctx );
}
diff --git a/tests/suites/test_suite_rsa.function b/tests/suites/test_suite_rsa.function
index af26264..154b7c4 100644
--- a/tests/suites/test_suite_rsa.function
+++ b/tests/suites/test_suite_rsa.function
@@ -28,6 +28,7 @@
rsa_context ctx;
mpi P1, Q1, H, G;
int msg_len;
+ rnd_pseudo_info rnd_info;
mpi_init( &P1 ); mpi_init( &Q1 ); mpi_init( &H ); mpi_init( &G );
rsa_init( &ctx, padding_mode, 0 );
@@ -36,6 +37,7 @@
memset( hash_result, 0x00, 1000 );
memset( output, 0x00, 1000 );
memset( output_str, 0x00, 1000 );
+ memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
ctx.len = mod / 8;
TEST_ASSERT( mpi_read_string( &ctx.P, radix_P, input_P ) == 0 );
@@ -59,7 +61,7 @@
if( md_info_from_type( digest ) != NULL )
TEST_ASSERT( md( md_info_from_type( digest ), message_str, msg_len, hash_result ) == 0 );
- TEST_ASSERT( rsa_pkcs1_sign( &ctx, NULL, NULL, RSA_PRIVATE, digest, 0, hash_result, output ) == result );
+ TEST_ASSERT( rsa_pkcs1_sign( &ctx, &rnd_pseudo_rand, &rnd_info, RSA_PRIVATE, digest, 0, hash_result, output ) == result );
if( result == 0 )
{
hexify( output_str, output, ctx.len );
@@ -100,7 +102,7 @@
if( md_info_from_type( digest ) != NULL )
TEST_ASSERT( md( md_info_from_type( digest ), message_str, msg_len, hash_result ) == 0 );
- TEST_ASSERT( rsa_pkcs1_verify( &ctx, RSA_PUBLIC, digest, 0, hash_result, result_str ) == result );
+ TEST_ASSERT( rsa_pkcs1_verify( &ctx, NULL, NULL, RSA_PUBLIC, digest, 0, hash_result, result_str ) == result );
rsa_free( &ctx );
}
@@ -121,6 +123,7 @@
rsa_context ctx;
mpi P1, Q1, H, G;
int hash_len;
+ rnd_pseudo_info rnd_info;
mpi_init( &P1 ); mpi_init( &Q1 ); mpi_init( &H ); mpi_init( &G );
rsa_init( &ctx, padding_mode, 0 );
@@ -129,6 +132,7 @@
memset( hash_result, 0x00, 1000 );
memset( output, 0x00, 1000 );
memset( output_str, 0x00, 1000 );
+ memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
ctx.len = mod / 8;
TEST_ASSERT( mpi_read_string( &ctx.P, radix_P, input_P ) == 0 );
@@ -150,7 +154,7 @@
unhexify( message_str, message_hex_string );
hash_len = unhexify( hash_result, hash_result_string );
- TEST_ASSERT( rsa_pkcs1_sign( &ctx, NULL, NULL, RSA_PRIVATE, POLARSSL_MD_NONE, hash_len, hash_result, output ) == 0 );
+ TEST_ASSERT( rsa_pkcs1_sign( &ctx, &rnd_pseudo_rand, &rnd_info, RSA_PRIVATE, POLARSSL_MD_NONE, hash_len, hash_result, output ) == 0 );
hexify( output_str, output, ctx.len );
@@ -188,7 +192,7 @@
hash_len = unhexify( hash_result, hash_result_string );
unhexify( result_str, result_hex_str );
- TEST_ASSERT( rsa_pkcs1_verify( &ctx, RSA_PUBLIC, POLARSSL_MD_NONE, hash_len, hash_result, result_str ) == correct );
+ TEST_ASSERT( rsa_pkcs1_verify( &ctx, NULL, NULL, RSA_PUBLIC, POLARSSL_MD_NONE, hash_len, hash_result, result_str ) == correct );
rsa_free( &ctx );
}
@@ -282,6 +286,7 @@
rsa_context ctx;
mpi P1, Q1, H, G;
size_t output_len;
+ rnd_pseudo_info rnd_info;
mpi_init( &P1 ); mpi_init( &Q1 ); mpi_init( &H ); mpi_init( &G );
rsa_init( &ctx, padding_mode, 0 );
@@ -289,6 +294,7 @@
memset( message_str, 0x00, 1000 );
memset( output, 0x00, 1000 );
memset( output_str, 0x00, 1000 );
+ memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
ctx.len = mod / 8;
TEST_ASSERT( mpi_read_string( &ctx.P, radix_P, input_P ) == 0 );
@@ -310,7 +316,7 @@
unhexify( message_str, message_hex_string );
output_len = 0;
- TEST_ASSERT( rsa_pkcs1_decrypt( &ctx, RSA_PRIVATE, &output_len, message_str, output, max_output ) == result );
+ TEST_ASSERT( rsa_pkcs1_decrypt( &ctx, rnd_pseudo_rand, &rnd_info, RSA_PRIVATE, &output_len, message_str, output, max_output ) == result );
if( result == 0 )
{
hexify( output_str, output, ctx.len );
@@ -367,6 +373,7 @@
unsigned char output_str[1000];
rsa_context ctx;
mpi P1, Q1, H, G;
+ rnd_pseudo_info rnd_info;
mpi_init( &P1 ); mpi_init( &Q1 ); mpi_init( &H ); mpi_init( &G );
rsa_init( &ctx, RSA_PKCS_V15, 0 );
@@ -374,6 +381,7 @@
memset( message_str, 0x00, 1000 );
memset( output, 0x00, 1000 );
memset( output_str, 0x00, 1000 );
+ memset( &rnd_info, 0, sizeof( rnd_pseudo_info ) );
ctx.len = mod / 8;
TEST_ASSERT( mpi_read_string( &ctx.P, radix_P, input_P ) == 0 );
@@ -394,7 +402,7 @@
unhexify( message_str, message_hex_string );
- TEST_ASSERT( rsa_private( &ctx, message_str, output ) == result );
+ TEST_ASSERT( rsa_private( &ctx, rnd_pseudo_rand, &rnd_info, message_str, output ) == result );
if( result == 0 )
{
hexify( output_str, output, ctx.len );
