Replace all HMAC formats' tests with ones that go up to length 125

and add a "hmac" type, testing all of them (and RAKP).

Author: magnum

hmacMD5_tst.in

@@ -135,12 +135,12 @@
 (base)(sha)(sha2),(X),(jumbo),10000,raw-sha256,pw,rawsha256_tst.in,raw-sha256,Y,X,(1500),(1500)
 (base)(sha)(sha2),(X),(jumbo),10000,raw-sha384,pw,rawsha384_tst.in,raw-sha384,Y,X,(1500),(1500)
 (base)(sha)(sha2),(X),(jumbo),10000,raw-sha512,pw,rawsha512_tst.in,raw-sha512,Y,X,(1500),(1500)
-(base)(sha)(sha1),(X),(jumbo),10000,hmac-sha1,pw,hmacSHA1_tst.in,hmac-sha1,Y,X,(1500),(1500)
-(base)(sha)(sha1),(X),(jumbo),10000,rakp,pw,rakp_tst.in,rakp,Y,X,(1500),(1500)
-(base)(sha)(sha2),(X),(jumbo),10000,hmac-sha224,pw,hmacSHA224_tst.in,hmac-sha224,Y,X,(1500),(1500)
-(base)(sha)(sha2),(X),(jumbo),10000,hmac-sha256,pw,hmacSHA256_tst.in,hmac-sha256,Y,X,(1500),(1500)
-(sha)(sha2),(full),(jumbo),10000,hmac-sha384,pw,hmacSHA384_tst.in,hmac-sha384,Y,X,(1500),(1500)
-(sha)(sha2),(full),(jumbo),10000,hmac-sha512,pw,hmacSHA512_tst.in,hmac-sha512,Y,X,(1500),(1500)
+(base)(sha)(sha1)(hmac),(X),(jumbo),10000,hmac-sha1,pw,hmacSHA1_tst.in,hmac-sha1,Y,X,(1500),(1500)
+(base)(sha)(sha1)(hmac),(X),(jumbo),10000,rakp,pw,rakp_tst.in,rakp,Y,X,(1500),(1500)
+(base)(sha)(sha2)(hmac),(X),(jumbo),10000,hmac-sha224,pw,hmacSHA224_tst.in,hmac-sha224,Y,X,(1500),(1500)
+(base)(sha)(sha2)(hmac),(X),(jumbo),10000,hmac-sha256,pw,hmacSHA256_tst.in,hmac-sha256,Y,X,(1500),(1500)
+(sha)(sha2)(hmac),(X),(jumbo),10000,hmac-sha384,pw,hmacSHA384_tst.in,hmac-sha384,Y,X,(1500),(1500)
+(sha)(sha2)(hmac),(X),(jumbo),10000,hmac-sha512,pw,hmacSHA512_tst.in,hmac-sha512,Y,X,(1500),(1500)
 (base)(sha)(sha2),(X),(jumbo),40,sha256crypt,pw,SHA256crypt_tst.in,sha256crypt,Y,X,(1500),(1500)
 (sha)(sha2),(full),(jumbo),40,sha512crypt,pw,SHA512crypt_tst.in,sha512crypt,Y,X,(1500),(1500)
 (base)(sha)(sha2),(X),(jumbo),10000,XSHA512,pw,XSHA512_tst.in,xsha512,Y,X,(1500),(1500)
@@ -180,7 +180,7 @@
 (openssha)(base)(sha)(sha1),(X),(jumbo),10000,OpenSSHA,pw,openssha_tst.in,salted-sha1,Y,X,(1500),(1500)
 (ns)(netscreen)(base),(X),(jumbo),10000,Netscreen_MD5,pw,ns_tst.in,md5ns,N,X,(1500),(1500)
 (osx)(base)(sha)(sha1),(X),(jumbo),10000,MAC_OSX_Salted_SHA1,pw,XSHA_tst.in,xsha,N,X,(1500),(1500)
-(base),(X),(jumbo),10000,hmacMD5,pw,hmacMD5_tst.in,hmac-md5,N,X,(1500),(1500)
+(base)(hmac),(X),(jumbo),10000,hmacMD5,pw,hmacMD5_tst.in,hmac-md5,N,X,(1500),(1500)
 (base),(X),(jumbo),10000,mskrb5,pw,mskrb5_tst.in,mskrb5,N,X,(1500),(1500)
 (base),(X),(jumbo),10000,krb5pa-md5,pw,mskrb5_tst.in,krb5pa-md5,N,X,(1500),(1500)
 (base),(X),(jumbo),10000,BFegg,pw,BFegg_tst.in,bfegg,Y,X,(1500),(1500)