diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-04-03 23:14:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-03 23:14:01 +0200 |
| commit | 1710582473330dc6e7758953e3378187b5e3f226 (patch) | |
| tree | 7dc769e2f23c15c639129845882e308ea3b0b430 /thirdparty/mbedtls/library/pkcs5.c | |
| parent | 60d89d0ab315d957bb858eecb5c8b837eb160fa1 (diff) | |
| parent | 2e078142a0803ee5b411959734f857fbac666951 (diff) | |
Merge pull request #17847 from Faless/lws_update
LWS v2.4.2, mbedTLS v2.8.0, Websocket SSL support
Diffstat (limited to 'thirdparty/mbedtls/library/pkcs5.c')
| -rw-r--r-- | thirdparty/mbedtls/library/pkcs5.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/thirdparty/mbedtls/library/pkcs5.c b/thirdparty/mbedtls/library/pkcs5.c index e28d5a8473..95f44fa98b 100644 --- a/thirdparty/mbedtls/library/pkcs5.c +++ b/thirdparty/mbedtls/library/pkcs5.c @@ -96,11 +96,9 @@ static int pkcs5_parse_pbkdf2_params( const mbedtls_asn1_buf *params, if( ( ret = mbedtls_asn1_get_alg_null( &p, end, &prf_alg_oid ) ) != 0 ) return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + ret ); - if( MBEDTLS_OID_CMP( MBEDTLS_OID_HMAC_SHA1, &prf_alg_oid ) != 0 ) + if( mbedtls_oid_get_md_hmac( &prf_alg_oid, md_type ) != 0 ) return( MBEDTLS_ERR_PKCS5_FEATURE_UNAVAILABLE ); - *md_type = MBEDTLS_MD_SHA1; - if( p != end ) return( MBEDTLS_ERR_PKCS5_INVALID_FORMAT + MBEDTLS_ERR_ASN1_LENGTH_MISMATCH ); |