From 2b4b28dc32ce7623f6169b43cd18585174de6b20 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Wed, 26 Jan 2011 00:56:19 +0000 Subject: And so it begins... again. Initial FIPS 140-2 code ported to HEAD. Doesn't even compile yet, may have missing files, extraneous files and other nastiness. In other words: it's experimental ATM, OK? --- fips/dh/.cvsignore | 4 ++ fips/dh/Makefile | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++ fips/dh/fips_dh_lib.c | 95 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 214 insertions(+) create mode 100644 fips/dh/.cvsignore create mode 100644 fips/dh/Makefile create mode 100644 fips/dh/fips_dh_lib.c (limited to 'fips/dh') diff --git a/fips/dh/.cvsignore b/fips/dh/.cvsignore new file mode 100644 index 0000000000..9b0c7485d9 --- /dev/null +++ b/fips/dh/.cvsignore @@ -0,0 +1,4 @@ +lib +*.flc +semantic.cache +Makefile.save diff --git a/fips/dh/Makefile b/fips/dh/Makefile new file mode 100644 index 0000000000..7f8c4895da --- /dev/null +++ b/fips/dh/Makefile @@ -0,0 +1,115 @@ +# +# OpenSSL/fips/dh/Makefile +# + +DIR= dh +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= +APPS= + +LIB=$(TOP)/libcrypto.a +LIBSRC= fips_dh_lib.c +LIBOBJ= fips_dh_lib.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: + +fips_test: + +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_dh_check.o: ../../include/openssl/bio.h ../../include/openssl/bn.h +fips_dh_check.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h +fips_dh_check.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +fips_dh_check.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h +fips_dh_check.o: ../../include/openssl/opensslconf.h +fips_dh_check.o: ../../include/openssl/opensslv.h +fips_dh_check.o: ../../include/openssl/ossl_typ.h +fips_dh_check.o: ../../include/openssl/safestack.h +fips_dh_check.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +fips_dh_check.o: fips_dh_check.c +fips_dh_gen.o: ../../include/openssl/bio.h ../../include/openssl/bn.h +fips_dh_gen.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h +fips_dh_gen.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +fips_dh_gen.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h +fips_dh_gen.o: ../../include/openssl/opensslconf.h +fips_dh_gen.o: ../../include/openssl/opensslv.h +fips_dh_gen.o: ../../include/openssl/ossl_typ.h +fips_dh_gen.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +fips_dh_gen.o: ../../include/openssl/symhacks.h fips_dh_gen.c +fips_dh_key.o: ../../include/openssl/bio.h ../../include/openssl/bn.h +fips_dh_key.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h +fips_dh_key.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h +fips_dh_key.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h +fips_dh_key.o: ../../include/openssl/opensslconf.h +fips_dh_key.o: ../../include/openssl/opensslv.h +fips_dh_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h +fips_dh_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +fips_dh_key.o: ../../include/openssl/symhacks.h fips_dh_key.c +fips_dh_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h +fips_dh_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h +fips_dh_lib.o: ../../include/openssl/e_os2.h +fips_dh_lib.o: ../../include/openssl/opensslconf.h +fips_dh_lib.o: ../../include/openssl/opensslv.h +fips_dh_lib.o: ../../include/openssl/ossl_typ.h +fips_dh_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h +fips_dh_lib.o: ../../include/openssl/symhacks.h fips_dh_lib.c diff --git a/fips/dh/fips_dh_lib.c b/fips/dh/fips_dh_lib.c new file mode 100644 index 0000000000..4a822cf192 --- /dev/null +++ b/fips/dh/fips_dh_lib.c @@ -0,0 +1,95 @@ +/* fips_dh_lib.c */ +/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL + * project 2007. + */ +/* ==================================================================== + * Copyright (c) 2007 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * licensing@OpenSSL.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + +#include +#include +#include + +/* Minimal FIPS versions of FIPS_dh_new() and FIPS_dh_free(): to + * reduce external dependencies. + */ + +DH *FIPS_dh_new(void) + { + DH *ret; + ret = OPENSSL_malloc(sizeof(DH)); + if (!ret) + return NULL; + memset(ret, 0, sizeof(DH)); + ret->meth = DH_OpenSSL(); + if (ret->meth->init) + ret->meth->init(ret); + return ret; + } + +void FIPS_dh_free(DH *r) + { + if (!r) + return; + if (r->meth->finish) + r->meth->finish(r); + if (r->p != NULL) BN_clear_free(r->p); + if (r->g != NULL) BN_clear_free(r->g); + if (r->q != NULL) BN_clear_free(r->q); + if (r->j != NULL) BN_clear_free(r->j); + if (r->seed) OPENSSL_free(r->seed); + if (r->counter != NULL) BN_clear_free(r->counter); + if (r->pub_key != NULL) BN_clear_free(r->pub_key); + if (r->priv_key != NULL) BN_clear_free(r->priv_key); + OPENSSL_free(r); + } -- cgit v1.2.3