mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-01-06 11:41:12 +03:00
Merge remote-tracking branch 'mbedtls/development' into mbedtls_private_with_python
Conflicts:
include/mbedtls/ssl.h
include/psa/crypto_struct.h
Conflicts fixed by using the code from development branch
and manually re-applying the MBEDTLS_PRIVATE wrapping.
This commit is contained in:
@@ -66,7 +66,7 @@ int main( int argc, char *argv[] )
|
||||
unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
|
||||
char filename[512];
|
||||
|
||||
mbedtls_rsa_init( &rsa, MBEDTLS_RSA_PKCS_V15, 0 );
|
||||
mbedtls_rsa_init( &rsa );
|
||||
|
||||
if( argc != 2 )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user