Merge remote-tracking branch 'public/pr/1497' into development

2018-06-12 16:53:04 +01:00 · 2018-06-12 16:53:04 +01:00 · e47d6fd97e
commit e47d6fd97e
parent ebe23ed738 10e0e4d4ff
16 changed files with 627 additions and 4 deletions
--- a/scripts/generate_errors.pl
+++ b/scripts/generate_errors.pl
@ -31,7 +31,7 @@ my $error_format_file = $data_dir.'/error.fmt';

 my @low_level_modules = qw( AES ARC4 ARIA ASN1 BASE64 BIGNUM BLOWFISH
                            CAMELLIA CCM CMAC CTR_DRBG DES
-                            ENTROPY GCM HMAC_DRBG MD2 MD4 MD5
+                            ENTROPY GCM HKDF HMAC_DRBG MD2 MD4 MD5
                            NET OID PADLOCK PBKDF2 RIPEMD160
                            SHA1 SHA256 SHA512 THREADING XTEA );
 my @high_level_modules = qw( CIPHER DHM ECP MD