Commit afc580b9 authored Nov 05, 2018 by Pauli

GMAC implementation


Remove GMAC demo program because it has been superceded by the EVP MAC one

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7548)

parent 2aaa0b14

CHANGES

+3 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,9 @@

		Changes between 1.1.1 and 1.1.2 [xx XXX xxxx]

		*) Add GMAC to EVP_MAC.
		[Paul Dale]

		*) Ported the HMAC, CMAC and SipHash EVP_PKEY_METHODs to EVP_MAC.
		[Richard Levitte]

Configure

+1 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,7 @@ $config{sdirs} = [
		"bn", "ec", "rsa", "dsa", "dh", "sm2", "dso", "engine",
		"buffer", "bio", "stack", "lhash", "rand", "err",
		"evp", "asn1", "pem", "x509", "x509v3", "conf", "txt_db", "pkcs7", "pkcs12", "comp", "ocsp", "ui",
		"cms", "ts", "srp", "cmac", "ct", "async", "kdf", "store"
		"cms", "ts", "srp", "gmac", "cmac", "ct", "async", "kdf", "store"
		];
		# test/ subdirectories to build
		$config{tdirs} = [ "ossl_shim" ];

crypto/err/openssl.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -801,6 +801,7 @@ EVP_F_EVP_PKEY_VERIFY_RECOVER:144:EVP_PKEY_verify_recover
		EVP_F_EVP_PKEY_VERIFY_RECOVER_INIT:145:EVP_PKEY_verify_recover_init
		EVP_F_EVP_SIGNFINAL:107:EVP_SignFinal
		EVP_F_EVP_VERIFYFINAL:108:EVP_VerifyFinal
		EVP_F_GMAC_CTRL:215:gmac_ctrl
		EVP_F_INT_CTX_NEW:157:int_ctx_new
		EVP_F_OK_NEW:200:ok_new
		EVP_F_PKCS5_PBE_KEYIVGEN:117:PKCS5_PBE_keyivgen
		@@ -2223,6 +2224,7 @@ EVP_R_ARIA_KEY_SETUP_FAILED:176:aria key setup failed
		EVP_R_BAD_DECRYPT:100:bad decrypt
		EVP_R_BUFFER_TOO_SMALL:155:buffer too small
		EVP_R_CAMELLIA_KEY_SETUP_FAILED:157:camellia key setup failed
		EVP_R_CIPHER_NOT_GCM_MODE:184:cipher not gcm mode
		EVP_R_CIPHER_PARAMETER_ERROR:122:cipher parameter error
		EVP_R_COMMAND_NOT_SUPPORTED:147:command not supported
		EVP_R_COPY_ERROR:173:copy error

crypto/evp/c_allm.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ void openssl_add_all_macs_int(void)
		#ifndef OPENSSL_NO_CMAC
		EVP_add_mac(&cmac_meth);
		#endif
		EVP_add_mac(&gmac_meth);
		EVP_add_mac(&hmac_meth);
		#ifndef OPENSSL_NO_SIPHASH
		EVP_add_mac(&siphash_meth);

crypto/evp/evp_err.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,7 @@ static const ERR_STRING_DATA EVP_str_functs[] = {
		"EVP_PKEY_verify_recover_init"},
		{ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_SIGNFINAL, 0), "EVP_SignFinal"},
		{ERR_PACK(ERR_LIB_EVP, EVP_F_EVP_VERIFYFINAL, 0), "EVP_VerifyFinal"},
		{ERR_PACK(ERR_LIB_EVP, EVP_F_GMAC_CTRL, 0), "gmac_ctrl"},
		{ERR_PACK(ERR_LIB_EVP, EVP_F_INT_CTX_NEW, 0), "int_ctx_new"},
		{ERR_PACK(ERR_LIB_EVP, EVP_F_OK_NEW, 0), "ok_new"},
		{ERR_PACK(ERR_LIB_EVP, EVP_F_PKCS5_PBE_KEYIVGEN, 0), "PKCS5_PBE_keyivgen"},
		@@ -170,6 +171,8 @@ static const ERR_STRING_DATA EVP_str_reasons[] = {
		{ERR_PACK(ERR_LIB_EVP, 0, EVP_R_BUFFER_TOO_SMALL), "buffer too small"},
		{ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CAMELLIA_KEY_SETUP_FAILED),
		"camellia key setup failed"},
		{ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CIPHER_NOT_GCM_MODE),
		"cipher not gcm mode"},
		{ERR_PACK(ERR_LIB_EVP, 0, EVP_R_CIPHER_PARAMETER_ERROR),
		"cipher parameter error"},
		{ERR_PACK(ERR_LIB_EVP, 0, EVP_R_COMMAND_NOT_SUPPORTED),