Merge pull request #638 from ARMmbed/development-proposed

Merge development into development-restricted
This commit is contained in:
Gilles Peskine 2019-08-05 11:06:20 +02:00 committed by GitHub
commit 41f2de9da2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
62 changed files with 1012 additions and 1309 deletions

View file

@ -357,8 +357,12 @@ int main( int argc, char *argv[] )
{
if( strcmp( q, "SHA1" ) == 0 )
opt.md = MBEDTLS_MD_SHA1;
else if( strcmp( q, "SHA224" ) == 0 )
opt.md = MBEDTLS_MD_SHA224;
else if( strcmp( q, "SHA256" ) == 0 )
opt.md = MBEDTLS_MD_SHA256;
else if( strcmp( q, "SHA384" ) == 0 )
opt.md = MBEDTLS_MD_SHA384;
else if( strcmp( q, "SHA512" ) == 0 )
opt.md = MBEDTLS_MD_SHA512;
else if( strcmp( q, "MD2" ) == 0 )