diff options
| author | Mateusz Starzyk <mateusz.starzyk@mobica.com> | 2021-05-27 15:17:07 +0200 |
|---|---|---|
| committer | Mateusz Starzyk <mateusz.starzyk@mobica.com> | 2021-05-27 16:02:46 +0200 |
| commit | e7dce558c9881aa3c56ae915278f732c23c59455 (patch) | |
| tree | 9aa417f6e242836c04d5203471a35a12a9b01287 /programs/pkey | |
| parent | 55768f26fc999b560efc2b13b0d33faa43b24bbf (diff) | |
| parent | 142c205ffc275808e31d3fefb1d1b56c2c342181 (diff) | |
| download | mbedtls-e7dce558c9881aa3c56ae915278f732c23c59455.zip mbedtls-e7dce558c9881aa3c56ae915278f732c23c59455.tar.gz mbedtls-e7dce558c9881aa3c56ae915278f732c23c59455.tar.bz2 | |
Merge branch 'development' into mbedtls_private_with_python
Conflicts:
include/mbedtls/ssl.h
Conflicts resolved by using code from development branch and
manually re-applying MBEDTLS_PRIVATE wrapping.
Diffstat (limited to 'programs/pkey')
| -rw-r--r-- | programs/pkey/dh_client.c | 4 | ||||
| -rw-r--r-- | programs/pkey/dh_server.c | 2 | ||||
| -rw-r--r-- | programs/pkey/rsa_encrypt.c | 3 | ||||
| -rw-r--r-- | programs/pkey/rsa_sign.c | 2 | ||||
| -rw-r--r-- | programs/pkey/rsa_verify.c | 4 |
5 files changed, 7 insertions, 8 deletions
diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c index f37df4a..8a9a4f6 100644 --- a/programs/pkey/dh_client.c +++ b/programs/pkey/dh_client.c @@ -220,8 +220,8 @@ int main( void ) goto exit; } - if( ( ret = mbedtls_rsa_pkcs1_verify( &rsa, NULL, NULL, MBEDTLS_RSA_PUBLIC, - MBEDTLS_MD_SHA256, 0, hash, p ) ) != 0 ) + if( ( ret = mbedtls_rsa_pkcs1_verify( &rsa, MBEDTLS_MD_SHA256, + 0, hash, p ) ) != 0 ) { mbedtls_printf( " failed\n ! mbedtls_rsa_pkcs1_verify returned %d\n\n", ret ); goto exit; diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c index d19ddad..16b9f88 100644 --- a/programs/pkey/dh_server.c +++ b/programs/pkey/dh_server.c @@ -229,7 +229,7 @@ int main( void ) buf[n ] = (unsigned char)( rsa.MBEDTLS_PRIVATE(len) >> 8 ); buf[n + 1] = (unsigned char)( rsa.MBEDTLS_PRIVATE(len) ); - if( ( ret = mbedtls_rsa_pkcs1_sign( &rsa, NULL, NULL, MBEDTLS_RSA_PRIVATE, MBEDTLS_MD_SHA256, + if( ( ret = mbedtls_rsa_pkcs1_sign( &rsa, NULL, NULL, MBEDTLS_MD_SHA256, 0, hash, buf + n + 2 ) ) != 0 ) { mbedtls_printf( " failed\n ! mbedtls_rsa_pkcs1_sign returned %d\n\n", ret ); diff --git a/programs/pkey/rsa_encrypt.c b/programs/pkey/rsa_encrypt.c index 03a6e89..1c7e17e 100644 --- a/programs/pkey/rsa_encrypt.c +++ b/programs/pkey/rsa_encrypt.c @@ -143,8 +143,7 @@ int main( int argc, char *argv[] ) fflush( stdout ); ret = mbedtls_rsa_pkcs1_encrypt( &rsa, mbedtls_ctr_drbg_random, - &ctr_drbg, MBEDTLS_RSA_PUBLIC, - strlen( argv[1] ), input, buf ); + &ctr_drbg, strlen( argv[1] ), input, buf ); if( ret != 0 ) { mbedtls_printf( " failed\n ! mbedtls_rsa_pkcs1_encrypt returned %d\n\n", diff --git a/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c index 8e657a7..7bd9eae 100644 --- a/programs/pkey/rsa_sign.c +++ b/programs/pkey/rsa_sign.c @@ -146,7 +146,7 @@ int main( int argc, char *argv[] ) goto exit; } - if( ( ret = mbedtls_rsa_pkcs1_sign( &rsa, NULL, NULL, MBEDTLS_RSA_PRIVATE, MBEDTLS_MD_SHA256, + if( ( ret = mbedtls_rsa_pkcs1_sign( &rsa, NULL, NULL, MBEDTLS_MD_SHA256, 20, hash, buf ) ) != 0 ) { mbedtls_printf( " failed\n ! mbedtls_rsa_pkcs1_sign returned -0x%0x\n\n", (unsigned int) -ret ); diff --git a/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c index e7e347c..49c9928 100644 --- a/programs/pkey/rsa_verify.c +++ b/programs/pkey/rsa_verify.c @@ -140,8 +140,8 @@ int main( int argc, char *argv[] ) goto exit; } - if( ( ret = mbedtls_rsa_pkcs1_verify( &rsa, NULL, NULL, MBEDTLS_RSA_PUBLIC, - MBEDTLS_MD_SHA256, 20, hash, buf ) ) != 0 ) + if( ( ret = mbedtls_rsa_pkcs1_verify( &rsa, MBEDTLS_MD_SHA256, + 20, hash, buf ) ) != 0 ) { mbedtls_printf( " failed\n ! mbedtls_rsa_pkcs1_verify returned -0x%0x\n\n", (unsigned int) -ret ); goto exit; |