1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00

Merge branch 'mbedtls-1.3' into development

* mbedtls-1.3:
  Use link-time garbage collection in memory.sh
  scripts/memory.sh only work on Linux
  Add missing 'const' on selftest data
  Use only headers for doxygen (no doc in C files)
  Add missing extern "C" guard in aesni.h
  Fix compile error with renego disabled
  Remove slow PKCS5 test
  Stop checking key-cert match systematically
  Make tests/*.sh runnable from anywhere
  Update visual C files
This commit is contained in:
Manuel Pégourié-Gonnard
2015-03-11 10:30:21 +00:00
13 changed files with 70 additions and 64 deletions

View File

@ -5390,7 +5390,7 @@ int ssl_set_own_cert( ssl_context *ssl, x509_crt *own_cert,
key_cert->cert = own_cert;
key_cert->key = pk_key;
return( pk_check_pair( &key_cert->cert->pk, key_cert->key ) );
return( 0 );
}
#if defined(POLARSSL_RSA_C)
@ -5419,7 +5419,7 @@ int ssl_set_own_cert_rsa( ssl_context *ssl, x509_crt *own_cert,
key_cert->cert = own_cert;
key_cert->key_own_alloc = 1;
return( pk_check_pair( &key_cert->cert->pk, key_cert->key ) );
return( 0 );
}
#endif /* POLARSSL_RSA_C */
@ -5448,7 +5448,7 @@ int ssl_set_own_cert_alt( ssl_context *ssl, x509_crt *own_cert,
key_cert->cert = own_cert;
key_cert->key_own_alloc = 1;
return( pk_check_pair( &key_cert->cert->pk, key_cert->key ) );
return( 0 );
}
#endif /* POLARSSL_X509_CRT_PARSE_C */