commit 42099c31552736713aba21103fc8bb9b84ea9a83
author Paul Bakker <p.j.bakker@polarssl.org> Mon Jan 27 11:45:49 2014 +0100
committer Paul Bakker <p.j.bakker@polarssl.org> Mon Jan 27 11:59:29 2014 +0100
tree 6c20b4088538bd495994f248e63b29b8ff473dde
parent d75ba40cc3f7f99c117456f59364784c4710b595

Revert "Add pk_rsa_set_padding() and rsa_set_padding()"

This reverts commit b4fae579e8fd72b5e57864d28b5b2c07bad5ce27.

Conflicts:
	library/pk.c
	tests/suites/test_suite_pk.data
	tests/suites/test_suite_pk.function

tests/suites/test_suite_pk.function

diff --git a/tests/suites/test_suite_pk.function b/tests/suites/test_suite_pk.function
index 5cdb1c8..85cdb74 100644
--- a/tests/suites/test_suite_pk.function
+++ b/tests/suites/test_suite_pk.function
@@ -55,31 +55,14 @@
 /* END_CASE */
 
 /* BEGIN_CASE depends_on:POLARSSL_RSA_C */
-void pk_set_rsa_padding( int type, int padding, int hash_id, int ret )
-{
-    pk_context pk;
-    unsigned char hash[50], sig[5000];
-
-    pk_init( &pk );
-
-    memset( hash, 0x2a, sizeof hash );
-    memset( sig, 0, sizeof sig );
-
-    TEST_ASSERT( pk_init_ctx( &pk, pk_info_from_type( type ) ) == 0 );
-    TEST_ASSERT( pk_rsa_set_padding( &pk, padding, hash_id ) == ret );
-
-    pk_free( &pk );
-}
-/* END_CASE */
-
-/* BEGIN_CASE depends_on:POLARSSL_RSA_C */
-void pk_rsa_verify_test_vec( char *message_hex_string, int digest, int scheme,
+void pk_rsa_verify_test_vec( char *message_hex_string, int digest,
                        int mod, int radix_N, char *input_N, int radix_E,
                        char *input_E, char *result_hex_str, int result )
 {
     unsigned char message_str[1000];
     unsigned char hash_result[1000];
     unsigned char result_str[1000];
+    rsa_context *rsa;
     pk_context pk;
     int msg_len;
 
@@ -90,16 +73,11 @@
     memset( result_str, 0x00, 1000 );
 
     TEST_ASSERT( pk_init_ctx( &pk, pk_info_from_type( POLARSSL_PK_RSA ) ) == 0 );
-    TEST_ASSERT( pk_rsa_set_padding( &pk, scheme, digest ) == 0 );
+    rsa = pk_rsa( pk );
 
-    /* Set RSA key manually */
-    {
-        rsa_context *rsa = pk_rsa( pk );
-
-        rsa->len = mod / 8;
-        TEST_ASSERT( mpi_read_string( &rsa->N, radix_N, input_N ) == 0 );
-        TEST_ASSERT( mpi_read_string( &rsa->E, radix_E, input_E ) == 0 );
-    }
+    rsa->len = mod / 8;
+    TEST_ASSERT( mpi_read_string( &rsa->N, radix_N, input_N ) == 0 );
+    TEST_ASSERT( mpi_read_string( &rsa->E, radix_E, input_E ) == 0 );
 
     msg_len = unhexify( message_str, message_hex_string );
     unhexify( result_str, result_hex_str );