Commit 399aa6b5 authored by Richard Levitte's avatar Richard Levitte
Browse files

Implement FIPS CMAC. 

* fips/cmac/*: Implement the basis for FIPS CMAC, using FIPS HMAC as
  an example.
* crypto/cmac/cmac.c: Enable the FIPS API.  Change to use M_EVP macros
  where possible.
* crypto/evp/evp.h: (some of the macros get added with this change)
* fips/fips.h, fips/utl/fips_enc.c: Add a few needed functions and use
  macros to have cmac.c use these functions.
* Makefile.org, fips/Makefile, fips/fips.c: Hook it in.
parent 487b023f

Makefile.org

+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \ 
	../crypto/bn/bn_word.o \

	../crypto/bn/bn_x931p.o \

	../crypto/buffer/buf_str.o \

	../crypto/cmac/cmac.o \

	../crypto/cryptlib.o \

	../crypto/des/cfb64ede.o \

	../crypto/des/cfb64enc.o \

crypto/cmac/cmac.c

+12 −10
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
 * ====================================================================

 */



#define OPENSSL_FIPSAPI



#include <stdio.h>

#include <stdlib.h>

#include <string.h>
@@ -129,7 +131,7 @@ int CMAC_CTX_copy(CMAC_CTX *out, const CMAC_CTX *in) 
		return 0;

	if (!EVP_CIPHER_CTX_copy(&out->cctx, &in->cctx))

		return 0;

	bl = EVP_CIPHER_CTX_block_size(&in->cctx);

	bl = M_EVP_CIPHER_CTX_block_size(&in->cctx);

	memcpy(out->k1, in->k1, bl);

	memcpy(out->k2, in->k2, bl);

	memcpy(out->tbl, in->tbl, bl);
@@ -148,31 +150,31 @@ int CMAC_Init(CMAC_CTX *ctx, const void *key, size_t keylen, 
		/* Not initialised */

		if (ctx->nlast_block == -1)

			return 0;

		if (!EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, NULL, zero_iv))

		if (!M_EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, NULL, zero_iv))

			return 0;

		return 1;

		}

	/* Initialiase context */

	if (cipher && !EVP_EncryptInit_ex(&ctx->cctx, cipher, impl, NULL, NULL))

	if (cipher && !M_EVP_EncryptInit_ex(&ctx->cctx, cipher, impl, NULL, NULL))

		return 0;

	/* Non-NULL key means initialisation complete */

	if (key)

		{

		int bl;

		if (!EVP_CIPHER_CTX_cipher(&ctx->cctx))

		if (!M_EVP_CIPHER_CTX_cipher(&ctx->cctx))

			return 0;

		if (!EVP_CIPHER_CTX_set_key_length(&ctx->cctx, keylen))

			return 0;

		if (!EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, key, zero_iv))

		if (!M_EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, key, zero_iv))

			return 0;

		bl = EVP_CIPHER_CTX_block_size(&ctx->cctx);

		bl = M_EVP_CIPHER_CTX_block_size(&ctx->cctx);

		if (!EVP_Cipher(&ctx->cctx, ctx->tbl, zero_iv, bl))

			return 0;

		make_kn(ctx->k1, ctx->tbl, bl);

		make_kn(ctx->k2, ctx->k1, bl);

		OPENSSL_cleanse(ctx->tbl, bl);

		/* Reset context again ready for first data block */

		if (!EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, NULL, zero_iv))

		if (!M_EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, NULL, zero_iv))

			return 0;

		/* Zero tbl so resume works */

		memset(ctx->tbl, 0, bl);
@@ -189,7 +191,7 @@ int CMAC_Update(CMAC_CTX *ctx, const void *in, size_t dlen) 
		return 0;

	if (dlen == 0)

		return 1;

	bl = EVP_CIPHER_CTX_block_size(&ctx->cctx);

	bl = M_EVP_CIPHER_CTX_block_size(&ctx->cctx);

	/* Copy into partial block if we need to */

	if (ctx->nlast_block > 0)

		{
@@ -228,7 +230,7 @@ int CMAC_Final(CMAC_CTX *ctx, unsigned char *out, size_t *poutlen) 
	int i, bl, lb;

	if (ctx->nlast_block == -1)

		return 0;

	bl = EVP_CIPHER_CTX_block_size(&ctx->cctx);

	bl = M_EVP_CIPHER_CTX_block_size(&ctx->cctx);

	*poutlen = (size_t)bl;

	if (!out)

		return 1;
@@ -265,5 +267,5 @@ int CMAC_resume(CMAC_CTX *ctx) 
	 * So reinitliasing using the last decrypted block will allow

	 * CMAC to continue after calling CMAC_Final(). 

	 */

	return EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, NULL, ctx->tbl);

	return M_EVP_EncryptInit_ex(&ctx->cctx, NULL, NULL, NULL, ctx->tbl);

	}

crypto/evp/evp.h

+15 −2
Original line number Diff line number Diff line
@@ -458,12 +458,23 @@ typedef int (EVP_PBE_KEYGEN)(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, 
#define M_EVP_MD_CTX_type(e)		M_EVP_MD_type(M_EVP_MD_CTX_md(e))

#define M_EVP_MD_CTX_md(e)			((e)->digest)



#define M_EVP_CIPHER_CTX_iv_length(e)	(e->cipher->iv_len)

#define M_EVP_CIPHER_CTX_flags(e)	(e->cipher->flags)

#define M_EVP_CIPHER_CTX_iv_length(e)	((e)->cipher->iv_len)

#define M_EVP_CIPHER_CTX_flags(e)	((e)->cipher->flags)

#define M_EVP_CIPHER_CTX_block_size(e)	((e)->cipher->block_size)

#define M_EVP_CIPHER_CTX_cipher(e)	((e)->cipher)

#define M_EVP_CIPHER_CTX_mode(e)	(M_EVP_CIPHER_CTX_flags(e) & EVP_CIPH_MODE)



#define M_EVP_CIPHER_CTX_set_flags(ctx,flgs) ((ctx)->flags|=(flgs))



#define M_EVP_EncryptInit(ctx,ciph,key,iv) \

	(EVP_CipherInit(ctx,ciph,key,iv,1))

#define M_EVP_EncryptInit_ex(ctx,ciph,impl,key,iv) \

	(EVP_CipherInit_ex(ctx,ciph,impl,key,iv,1))

#define M_EVP_DecryptInit(ctx,ciph,key,iv) \

	(EVP_CipherInit(ctx,ciph,key,iv,0))

#define M_EVP_DecryptInit_ex(ctx,ciph,impl,key,iv) \

	(EVP_CipherInit_ex(ctx,ciph,impl,key,iv,0))



int EVP_MD_type(const EVP_MD *md);

#define EVP_MD_nid(e)			EVP_MD_type(e)

#define EVP_MD_name(e)			OBJ_nid2sn(EVP_MD_nid(e))
@@ -1288,7 +1299,9 @@ void ERR_load_EVP_strings(void); 
#define EVP_F_EVP_SIGNFINAL				 107

#define EVP_F_EVP_VERIFYFINAL				 108

#define EVP_F_FIPS_CIPHERINIT				 166

#define EVP_F_FIPS_CIPHER_CTX_COPY			 170

#define EVP_F_FIPS_CIPHER_CTX_CTRL			 167

#define EVP_F_FIPS_CIPHER_CTX_SET_KEY_LENGTH		 171

#define EVP_F_FIPS_DIGESTINIT				 168

#define EVP_F_FIPS_MD_CTX_COPY				 169

#define EVP_F_INT_CTX_NEW				 157

fips/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ AFLAGS=$(ASFLAGS) 


LIBS=



FDIRS=sha rand des aes dsa ecdh ecdsa rsa dh hmac utl

FDIRS=sha rand des aes dsa ecdh ecdsa rsa dh cmac hmac utl



GENERAL=Makefile README fips-lib.com install.com
@@ -45,7 +45,7 @@ LIBSRC=fips.c 
LIBOBJ=fips.o



FIPS_OBJ_LISTS=sha/lib hmac/lib rand/lib des/lib aes/lib dsa/lib rsa/lib \

		dh/lib utl/lib ecdsa/lib

		dh/lib utl/lib ecdsa/lib cmac/lib



SRC= $(LIBSRC)

fips/cmac/Makefile

0 → 100644
+112 −0
Original line number Diff line number Diff line 
#

# OpenSSL/fips/cmac/Makefile

#



DIR=	cmac

TOP=	../..

CC=	cc

INCLUDES=

CFLAG=-g

INSTALL_PREFIX=

OPENSSLDIR=     /usr/local/ssl

INSTALLTOP=/usr/local/ssl

MAKEDEPPROG=	makedepend

MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)

MAKEFILE=	Makefile

AR=		ar r



CFLAGS= $(INCLUDES) $(CFLAG)



GENERAL=Makefile

TEST=fips_cmactest.c

APPS=



LIB=$(TOP)/libcrypto.a

LIBSRC= fips_cmac_selftest.c

LIBOBJ= fips_cmac_selftest.o



SRC= $(LIBSRC)



EXHEADER=

HEADER=	$(EXHEADER)



ALL=    $(GENERAL) $(SRC) $(HEADER)



top:

	(cd $(TOP); $(MAKE) DIRS=fips FDIRS=$(DIR) sub_all)



all:	lib



lib:	$(LIBOBJ)

	@echo $(LIBOBJ) > lib



files:

	$(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO



links:

	@$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER)

	@$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST)

	@$(PERL) $(TOP)/util/mklink.pl $(TOP)/apps $(APPS)



install:

	@headerlist="$(EXHEADER)"; for i in $$headerlist; \

	do \

	  (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \

	  chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \

	done



tags:

	ctags $(SRC)



tests:



Q=../testvectors/cmac/req

A=../testvectors/cmac/rsp



fips_test:

	-rm -rf $(A)

	mkdir $(A)

	if [ -f $(Q)/CMACGenAES256.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_cmactest -g < $(Q)/CMACGenAES256.req > $(A)/CMACGenAES256.rsp; fi

	if [ -f $(Q)/CMACVerAES256.req ]; then $(TOP)/util/shlib_wrap.sh $(TOP)/test/fips_cmactest -v < $(Q)/CMACVerAES256.req > $(A)/CMACVerAES256.rsp; fi



lint:

	lint -DLINT $(INCLUDES) $(SRC)>fluff



depend:

	$(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(SRC) $(TEST)



dclean:

	$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

	mv -f Makefile.new $(MAKEFILE)



clean:

	rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

# DO NOT DELETE THIS LINE -- make depend depends on it.



fips_cmac_selftest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

fips_cmac_selftest.o: ../../include/openssl/cmac.h

fips_cmac_selftest.o: ../../include/openssl/crypto.h

fips_cmac_selftest.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

fips_cmac_selftest.o: ../../include/openssl/evp.h ../../include/openssl/fips.h

fips_cmac_selftest.o: ../../include/openssl/lhash.h

fips_cmac_selftest.o: ../../include/openssl/obj_mac.h

fips_cmac_selftest.o: ../../include/openssl/objects.h

fips_cmac_selftest.o: ../../include/openssl/opensslconf.h

fips_cmac_selftest.o: ../../include/openssl/opensslv.h

fips_cmac_selftest.o: ../../include/openssl/ossl_typ.h

fips_cmac_selftest.o: ../../include/openssl/safestack.h

fips_cmac_selftest.o: ../../include/openssl/stack.h

fips_cmac_selftest.o: ../../include/openssl/symhacks.h fips_cmac_selftest.c

fips_cmactest.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

fips_cmactest.o: ../../include/openssl/bn.h ../../include/openssl/cmac.h

fips_cmactest.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h

fips_cmactest.o: ../../include/openssl/err.h ../../include/openssl/evp.h

fips_cmactest.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h

fips_cmactest.o: ../../include/openssl/obj_mac.h

fips_cmactest.o: ../../include/openssl/objects.h

fips_cmactest.o: ../../include/openssl/opensslconf.h

fips_cmactest.o: ../../include/openssl/opensslv.h

fips_cmactest.o: ../../include/openssl/ossl_typ.h

fips_cmactest.o: ../../include/openssl/safestack.h

fips_cmactest.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h

fips_cmactest.o: ../fips_utl.h fips_cmactest.c