Commit e4adad92 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Wire SHA3 EVPs and add tests. 



Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3943)
parent 91ce87c0

CHANGES

+3 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,9 @@ 
















 Changes between 1.1.0f and 1.1.1 [xx XXX xxxx]







 Changes between 1.1.0f and 1.1.1 [xx XXX xxxx]






























  *) Add SHA3.














     [Andy Polyakov]
























  *) The UI API becomes a permanent and integral part of libcrypto, i.e.







  *) The UI API becomes a permanent and integral part of libcrypto, i.e.











     not possible to disable entirely.  However, it's still possible to







     not possible to disable entirely.  However, it's still possible to











     disable the console reading UI method, UI_OpenSSL() (use UI_null()







     disable the console reading UI method, UI_OpenSSL() (use UI_null()

































crypto/evp/c_alld.c



+8
−0






























Original line number
Original line
Diff line number
Diff line








@@ -45,5 +45,13 @@ void openssl_add_all_digests_int(void)









#ifndef OPENSSL_NO_BLAKE2







#ifndef OPENSSL_NO_BLAKE2











    EVP_add_digest(EVP_blake2b512());







    EVP_add_digest(EVP_blake2b512());











    EVP_add_digest(EVP_blake2s256());







    EVP_add_digest(EVP_blake2s256());














#endif














    EVP_add_digest(EVP_sha3_224());














    EVP_add_digest(EVP_sha3_256());














    EVP_add_digest(EVP_sha3_384());














    EVP_add_digest(EVP_sha3_512());














#if 0














    EVP_add_digest(EVP_shake128());














    EVP_add_digest(EVP_shake256());











#endif







#endif











}






}
























doc/man3/EVP_DigestInit.pod



+14
−6






























Original line number
Original line
Diff line number
Diff line








@@ -7,9 +7,10 @@ EVP_MD_CTX_ctrl, EVP_DigestInit_ex, EVP_DigestUpdate, EVP_DigestFinal_ex,









EVP_DigestInit, EVP_DigestFinal, EVP_MD_CTX_copy, EVP_MD_type,







EVP_DigestInit, EVP_DigestFinal, EVP_MD_CTX_copy, EVP_MD_type,











EVP_MD_pkey_type, EVP_MD_size, EVP_MD_block_size, EVP_MD_CTX_md, EVP_MD_CTX_size,







EVP_MD_pkey_type, EVP_MD_size, EVP_MD_block_size, EVP_MD_CTX_md, EVP_MD_CTX_size,











EVP_MD_CTX_block_size, EVP_MD_CTX_type, EVP_md_null, EVP_md2, EVP_md5, EVP_sha1,







EVP_MD_CTX_block_size, EVP_MD_CTX_type, EVP_md_null, EVP_md2, EVP_md5, EVP_sha1,











EVP_sha224, EVP_sha256, EVP_sha384, EVP_sha512, EVP_mdc2,







EVP_sha224, EVP_sha256, EVP_sha384, EVP_sha512, EVP_sha3_224, EVP_sha3_256,











EVP_ripemd160, EVP_blake2b512, EVP_blake2s256, EVP_get_digestbyname,







EVP_sha3_384, EVP_sha3_512, EVP_mdc2, EVP_ripemd160, EVP_blake2b512,











EVP_get_digestbynid, EVP_get_digestbyobj - EVP digest routines







EVP_blake2s256, EVP_get_digestbyname, EVP_get_digestbynid,














EVP_get_digestbyobj - EVP digest routines































=head1 SYNOPSIS







=head1 SYNOPSIS






























@@ -55,6 +56,11 @@ EVP_get_digestbynid, EVP_get_digestbyobj - EVP digest routines









 const EVP_MD *EVP_sha384(void);







 const EVP_MD *EVP_sha384(void);











 const EVP_MD *EVP_sha512(void);







 const EVP_MD *EVP_sha512(void);


































 const EVP_MD *EVP_sha3_224(void);














 const EVP_MD *EVP_sha3_256(void);














 const EVP_MD *EVP_sha3_384(void);














 const EVP_MD *EVP_sha3_512(void);


























 const EVP_MD *EVP_get_digestbyname(const char *name);







 const EVP_MD *EVP_get_digestbyname(const char *name);











 const EVP_MD *EVP_get_digestbynid(int type);







 const EVP_MD *EVP_get_digestbynid(int type);











 const EVP_MD *EVP_get_digestbyobj(const ASN1_OBJECT *o);







 const EVP_MD *EVP_get_digestbyobj(const ASN1_OBJECT *o);










@@ -128,9 +134,11 @@ are no longer linked this function is only retained for compatibility









reasons.







reasons.































EVP_md2(), EVP_md5(), EVP_sha1(), EVP_sha224(), EVP_sha256(),







EVP_md2(), EVP_md5(), EVP_sha1(), EVP_sha224(), EVP_sha256(),











EVP_sha384(), EVP_sha512(), EVP_mdc2(), EVP_ripemd160(), EVP_blake2b512(), and







EVP_sha384(), EVP_sha512(), EVP_sha3_224(), EVP_sha3_256(),











EVP_blake2s256() return B<EVP_MD> structures for the MD2, MD5, SHA1, SHA224,







EVP_sha3_384(), EVP_sha3_512(), EVP_mdc2(), EVP_ripemd160(),











SHA256, SHA384, SHA512, MDC2, RIPEMD160, BLAKE2b-512, and BLAKE2s-256 digest







EVP_blake2b512(), and EVP_blake2s256() return B<EVP_MD> structures for














the MD2, MD5, SHA1, SHA224, SHA256, SHA384, SHA512, SHA3-224, SHA3-256,














SHA3-384, SHA3-512, MDC2, RIPEMD160, BLAKE2b-512, and BLAKE2s-256 digest











algorithms respectively.







algorithms respectively.































EVP_md_null() is a "null" message digest that does nothing: i.e. the hash it







EVP_md_null() is a "null" message digest that does nothing: i.e. the hash it

































test/recipes/30-test_evp_data/evpdigest.txt



+73
−0






























Original line number
Original line
Diff line number
Diff line








@@ -301,3 +301,76 @@ Count = 100000









Output = 0C99005BEB57EFF50A7CF005560DDF5D29057FD86B20BFD62DECA0F1CCEA4AF51FC15490EDDC47AF32BB2B66C34FF9AD8C6008AD677F77126953B226E4ED8B01







Output = 0C99005BEB57EFF50A7CF005560DDF5D29057FD86B20BFD62DECA0F1CCEA4AF51FC15490EDDC47AF32BB2B66C34FF9AD8C6008AD677F77126953B226E4ED8B01






















































Title = SHA3












































Digest = SHA3-224














Input = ""














Output = 6B4E03423667DBB73B6E15454F0EB1ABD4597F9A1B078E3F5B5A6BC7





























Digest = SHA3-224














Input = A3














Count = 200














Output = 9376816ABA503F72F96CE7EB65AC095DEEE3BE4BF9BBC2A1CB7E11E0





























Digest = SHA3-224














Input = 31c82d71785b7ca6b651cb6c8c9ad5e2aceb0b0633c088d33aa247ada7a594ff4936c023251319820a9b19fc6c48de8a6f7ada214176ccdaadaeef51ed43714ac0c8269bbd497e46e78bb5e58196494b2471b1680e2d4c6dbd249831bd83a4d3be06c8a2e903933974aa05ee748bfe6ef359f7a143edf0d4918da916bd6f15e26a790cff514b40a5da7f72e1ed2fe63a05b8149587bea05653718cc8980eadbfeca85b7c9c286dd040936585938be7f98219700c83a9443c2856a80ff46852b26d1b1edf72a30203cf6c44a10fa6eaf1920173cedfb5c4cf3ac665b37a86ed02155bbbf17dc2e786af9478fe0889d86c5bfa85a242eb0854b1482b7bd16f67f80bef9c7a628f05a107936a64273a97b0088b0e515451f916b5656230a12ba6dc78














Output = aab23c9e7fb9d7dacefdfd0b1ae85ab1374abff7c4e3f7556ecae412





























Digest = SHA3-224














Input = ab4f9d765085ccb474be6e2369568292532f6fa4dd9c50d02a7d8fab0fabb56a7f9680a2462c3753fafd3a252f9dddf1eb4a76835acfb59fc2a83441b8674f2995573697245e40549d2883f1d781a153b903e470f2f28e53e9646a66f7a5a7f0d5d9e6dd50e392be44867010c7ca77c1a5a2e1f00dcb82f589f759a1332b65c62766b9fa3483d399d7602a0969400642976e948d13243a8b89aa287ad5c230b47344d7783606aced3dfed86424abf7de77b026ce6cc35d20d1c500794332b0c1a1bc67dfc033c4c360a8a3aa5fd2f19d2db1bf3b807094b949900827e6438ef5991692b539d3c42227a6b362847e9d88a1b6855db7f58760d953690b26bd7258439a7f8409ae53137a3f2f14fa77a2a6bc0aa3bb7a19dd1c69554aae6c6703f3879057d3978c1a9d41bd3f492985aa0064f43fde2fa33ff6e1dfd4961e0aeacd4e3f412b4d35c0c864660d8779705a9c82bb824c405c54f429392e4da66ecfee7ef066139270ee9ccc83be5952ff5c84ffa8938f130cc52129ab825b6a5b585f01ebed13ce074c225f5b7d441cfc58c0c1039a2f127b3982ca7df546d4993027bd78ffb36ac08161063870d23f2df556b214














Output = d61f04985026eee29d0f9700f8c5aea32ec2c23b1a9357edeb2be20c












































Digest = SHA3-256














Input = ""














Output = A7FFC6F8BF1ED76651C14756A061D662F580FF4DE43B49FA82D80A4B80F8434A





























Digest = SHA3-256














Input = A3














Count = 200














Output = 79F38ADEC5C20307A98EF76E8324AFBFD46CFD81B22E3973C65FA1BD9DE31787





























Digest = SHA3-256














Input = b1caa396771a09a1db9bc20543e988e359d47c2a616417bbca1b62cb02796a888fc6eeff5c0b5c3d5062fcb4256f6ae1782f492c1cf03610b4a1fb7b814c057878e1190b9835425c7a4a0e182ad1f91535ed2a35033a5d8c670e21c575ff43c194a58a82d4a1a44881dd61f9f8161fc6b998860cbe4975780be93b6f87980bad0a99aa2cb7556b478ca35d1f3746c33e2bb7c47af426641cc7bbb3425e2144820345e1d0ea5b7da2c3236a52906acdc3b4d34e474dd714c0c40bf006a3a1d889a632983814bbc4a14fe5f159aa89249e7c738b3b73666bac2a615a83fd21ae0a1ce7352ade7b278b587158fd2fabb217aa1fe31d0bda53272045598015a8ae4d8cec226fefa58daa05500906c4d85e7567














Output = cb5648a1d61c6c5bdacd96f81c9591debc3950dcf658145b8d996570ba881a05





























Digest = SHA3-256














Input = 712b03d9ebe78d3a032a612939c518a6166ca9a161183a7596aa35b294d19d1f962da3ff64b57494cb5656e24adcf3b50e16f4e52135d2d9de76e94aa801cf49db10e384035329c54c9455bb3a9725fd9a44f44cb9078d18d3783d46ce372c31281aecef2f8b53d5702b863d71bc5786a33dd15d9256103b5ff7572f703d5cde6695e6c84f239acd1d6512ef581330590f4ab2a114ea064a693d5f8df5d908587bc7f998cde4a8b43d8821595566597dc8b3bf9ea78b154bd8907ee6c5d4d8a851f94be510962292b7ddda04d17b79fab4c022deb400e5489639dbc448f573d5cf72073a8001b36f73ac6677351b39d9bdb900e9a1121f488a7fa0aee60682e7dc7c531c85ec0154593ded3ae70e4121cae58445d8896b549cacf22d07cdace7625d57158721b44851d796d6511c38dac28dd37cbf2d7073b407fbc813149adc485e3dacee66755443c389d2d90dc70d8ff91816c0c5d7adbad7e30772a1f3ce76c72a6a2284ec7f174aefb6e9a895c118717999421b470a9665d2728c3c60c6d3e048d58b43c0d1b5b2f00be8b64bfe453d1e8fadf5699331f9














Output = 095dcd0bc55206d2e1e715fb7173fc16a81979f278495dfc69a6d8f3174eba5a












































Digest = SHA3-384














Input = ""














Output = 0C63A75B845E4F7D01107D852E4C2485C51A50AAAA94FC61995E71BBEE983A2AC3713831264ADB47FB6BD1E058D5F004





























Digest = SHA3-384














Input = A3














Count = 200














Output = 1881DE2CA7E41EF95DC4732B8F5F002B189CC1E42B74168ED1732649CE1DBCDD76197A31FD55EE989F2D7050DD473E8F





























Digest = SHA3-384














Input = 5fe35923b4e0af7dd24971812a58425519850a506dfa9b0d254795be785786c319a2567cbaa5e35bcf8fe83d943e23fa5169b73adc1fcf8b607084b15e6a013df147e46256e4e803ab75c110f77848136be7d806e8b2f868c16c3a90c14463407038cb7d9285079ef162c6a45cedf9c9f066375c969b5fcbcda37f02aacff4f31cded3767570885426bebd9eca877e44674e9ae2f0c24cdd0e7e1aaf1ff2fe7f80a1c4f5078eb34cd4f06fa94a2d1eab5806ca43fd0f06c60b63d5402b95c70c21ea65a151c5cfaf8262a46be3c722264b














Output = 3054d249f916a6039b2a9c3ebec1418791a0608a170e6d36486035e5f92635eaba98072a85373cb54e2ae3f982ce132b





























Digest = SHA3-384














Input = 035adcb639e5f28bb5c88658f45c1ce0be16e7dafe083b98d0ab45e8dcdbfa38e3234dfd973ba555b0cf8eea3c82ae1a3633fc565b7f2cc839876d3989f35731be371f60de140e3c916231ec780e5165bf5f25d3f67dc73a1c33655dfdf439dfbf1cbba8b779158a810ad7244f06ec078120cd18760af436a238941ce1e687880b5c879dc971a285a74ee85c6a746749a30159ee842e9b03f31d613dddd22975cd7fed06bd049d772cb6cc5a705faa734e87321dc8f2a4ea366a368a98bf06ee2b0b54ac3a3aeea637caebe70ad09ccda93cc06de95df73394a87ac9bbb5083a4d8a2458e91c7d5bf113aecae0ce279fdda76ba690787d26345e94c3edbc16a35c83c4d071b132dd81187bcd9961323011509c8f644a1c0a3f14ee40d7dd186f807f9edc7c02f6761061bbb6dd91a6c96ec0b9f10edbbd29dc52














Output = 02535d86cc7518484a2a238c921b739b1704a50370a2924abf39958c5976e658dc5e87440063112459bddb40308b1c70












































Digest = SHA3-512














Input = ""














Output = A69F73CCA23A9AC5C8B567DC185A756E97C982164FE25859E0D1DCC1475C80A615B2123AF1F5F94C11E3E9402C3AC558F500199D95B6D3E301758586281DCD26





























Digest = SHA3-512














Input = A3














Count = 200














Output = E76DFAD22084A8B1467FCF2FFA58361BEC7628EDF5F3FDC0E4805DC48CAEECA81B7C13C30ADF52A3659584739A2DF46BE589C51CA1A4A8416DF6545A1CE8BA00





























Digest = SHA3-512














Input = 664ef2e3a7059daf1c58caf52008c5227e85cdcb83b4c59457f02c508d4f4f69f826bd82c0cffc5cb6a97af6e561c6f96970005285e58f21ef6511d26e709889a7e513c434c90a3cf7448f0caeec7114c747b2a0758a3b4503a7cf0c69873ed31d94dbef2b7b2f168830ef7da3322c3d3e10cafb7c2c33c83bbf4c46a31da90cff3bfd4ccc6ed4b310758491eeba603a76














Output = e5825ff1a3c070d5a52fbbe711854a440554295ffb7a7969a17908d10163bfbe8f1d52a676e8a0137b56a11cdf0ffbb456bc899fc727d14bd8882232549d914e





























Digest = SHA3-512














Input = 991c4e7402c7da689dd5525af76fcc58fe9cc1451308c0c4600363586ccc83c9ec10a8c9ddaec3d7cfbd206484d09634b9780108440bf27a5fa4a428446b3214fa17084b6eb197c5c59a4e8df1cfc521826c3b1cbf6f4212f6bfb9bc106dfb5568395643de58bffa2774c31e67f5c1e7017f57caadbb1a56cc5b8a5cf9584552e17e7af9542ba13e9c54695e0dc8f24eddb93d5a3678e10c8a80ff4f27b677d40bef5cb5f9b3a659cc4127970cd2c11ebf22d514812dfefdd73600dfc10efba38e93e5bff47736126043e50f8b9b941e4ec3083fb762dbf15c86














Output = cd0f2a48e9aa8cc700d3f64efb013f3600ebdbb524930c682d21025eab990eb6d7c52e611f884031fafd9360e5225ab7e4ec24cbe97f3af6dbe4a86a4f068ba7