diff options
Diffstat (limited to 'src/lib/libcrypto/dh')
| -rw-r--r-- | src/lib/libcrypto/dh/Makefile | 63 | ||||
| -rw-r--r-- | src/lib/libcrypto/dh/Makefile.ssl | 133 | ||||
| -rw-r--r-- | src/lib/libcrypto/dh/dh.h | 245 | ||||
| -rw-r--r-- | src/lib/libcrypto/dh/dh_asn1.c | 87 | ||||
| -rw-r--r-- | src/lib/libcrypto/dh/dh_check.c | 146 | ||||
| -rw-r--r-- | src/lib/libcrypto/dh/dh_depr.c | 83 | ||||
| -rw-r--r-- | src/lib/libcrypto/dh/dh_err.c | 108 | ||||
| -rw-r--r-- | src/lib/libcrypto/dh/dh_gen.c | 179 | ||||
| -rw-r--r-- | src/lib/libcrypto/dh/dh_key.c | 267 | ||||
| -rw-r--r-- | src/lib/libcrypto/dh/dh_lib.c | 247 |
10 files changed, 1506 insertions, 52 deletions
diff --git a/src/lib/libcrypto/dh/Makefile b/src/lib/libcrypto/dh/Makefile index f23b4f7fde..d01fa960eb 100644 --- a/src/lib/libcrypto/dh/Makefile +++ b/src/lib/libcrypto/dh/Makefile | |||
| @@ -17,10 +17,8 @@ TEST= dhtest.c | |||
| 17 | APPS= | 17 | APPS= |
| 18 | 18 | ||
| 19 | LIB=$(TOP)/libcrypto.a | 19 | LIB=$(TOP)/libcrypto.a |
| 20 | LIBSRC= dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c \ | 20 | LIBSRC= dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c dh_depr.c |
| 21 | dh_ameth.c dh_pmeth.c dh_prn.c | 21 | LIBOBJ= dh_asn1.o dh_gen.o dh_key.o dh_lib.o dh_check.o dh_err.o dh_depr.o |
| 22 | LIBOBJ= dh_asn1.o dh_gen.o dh_key.o dh_lib.o dh_check.o dh_err.o dh_depr.o \ | ||
| 23 | dh_ameth.o dh_pmeth.o dh_prn.o | ||
| 24 | 22 | ||
| 25 | SRC= $(LIBSRC) | 23 | SRC= $(LIBSRC) |
| 26 | 24 | ||
| @@ -35,7 +33,7 @@ top: | |||
| 35 | all: lib | 33 | all: lib |
| 36 | 34 | ||
| 37 | lib: $(LIBOBJ) | 35 | lib: $(LIBOBJ) |
| 38 | $(AR) $(LIB) $(LIBOBJ) | 36 | $(ARX) $(LIB) $(LIBOBJ) |
| 39 | $(RANLIB) $(LIB) || echo Never mind. | 37 | $(RANLIB) $(LIB) || echo Never mind. |
| 40 | @touch lib | 38 | @touch lib |
| 41 | 39 | ||
| @@ -76,21 +74,6 @@ clean: | |||
| 76 | 74 | ||
| 77 | # DO NOT DELETE THIS LINE -- make depend depends on it. | 75 | # DO NOT DELETE THIS LINE -- make depend depends on it. |
| 78 | 76 | ||
| 79 | dh_ameth.o: ../../e_os.h ../../include/openssl/asn1.h | ||
| 80 | dh_ameth.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | ||
| 81 | dh_ameth.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
| 82 | dh_ameth.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h | ||
| 83 | dh_ameth.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h | ||
| 84 | dh_ameth.o: ../../include/openssl/ecdsa.h ../../include/openssl/err.h | ||
| 85 | dh_ameth.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h | ||
| 86 | dh_ameth.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | ||
| 87 | dh_ameth.o: ../../include/openssl/opensslconf.h | ||
| 88 | dh_ameth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 89 | dh_ameth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h | ||
| 90 | dh_ameth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | ||
| 91 | dh_ameth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h | ||
| 92 | dh_ameth.o: ../../include/openssl/x509_vfy.h ../asn1/asn1_locl.h ../cryptlib.h | ||
| 93 | dh_ameth.o: dh_ameth.c | ||
| 94 | dh_asn1.o: ../../e_os.h ../../include/openssl/asn1.h | 77 | dh_asn1.o: ../../e_os.h ../../include/openssl/asn1.h |
| 95 | dh_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h | 78 | dh_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h |
| 96 | dh_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h | 79 | dh_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h |
| @@ -146,35 +129,11 @@ dh_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h | |||
| 146 | dh_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h | 129 | dh_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h |
| 147 | dh_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h | 130 | dh_lib.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h |
| 148 | dh_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h | 131 | dh_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h |
| 149 | dh_lib.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h | 132 | dh_lib.o: ../../include/openssl/evp.h ../../include/openssl/fips.h |
| 150 | dh_lib.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | 133 | dh_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h |
| 151 | dh_lib.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 134 | dh_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 152 | dh_lib.o: ../../include/openssl/ossl_typ.h ../../include/openssl/pkcs7.h | 135 | dh_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 153 | dh_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | 136 | dh_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h |
| 154 | dh_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 137 | dh_lib.o: ../../include/openssl/sha.h ../../include/openssl/stack.h |
| 155 | dh_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h | 138 | dh_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h |
| 156 | dh_lib.o: ../cryptlib.h dh_lib.c | 139 | dh_lib.o: ../../include/openssl/x509_vfy.h ../cryptlib.h dh_lib.c |
| 157 | dh_pmeth.o: ../../e_os.h ../../include/openssl/asn1.h | ||
| 158 | dh_pmeth.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h | ||
| 159 | dh_pmeth.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h | ||
| 160 | dh_pmeth.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h | ||
| 161 | dh_pmeth.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h | ||
| 162 | dh_pmeth.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h | ||
| 163 | dh_pmeth.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
| 164 | dh_pmeth.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
| 165 | dh_pmeth.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | ||
| 166 | dh_pmeth.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 167 | dh_pmeth.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h | ||
| 168 | dh_pmeth.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | ||
| 169 | dh_pmeth.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h | ||
| 170 | dh_pmeth.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ../evp/evp_locl.h | ||
| 171 | dh_pmeth.o: dh_pmeth.c | ||
| 172 | dh_prn.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h | ||
| 173 | dh_prn.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
| 174 | dh_prn.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h | ||
| 175 | dh_prn.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
| 176 | dh_prn.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
| 177 | dh_prn.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | ||
| 178 | dh_prn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 179 | dh_prn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
| 180 | dh_prn.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_prn.c | ||
diff --git a/src/lib/libcrypto/dh/Makefile.ssl b/src/lib/libcrypto/dh/Makefile.ssl new file mode 100644 index 0000000000..e05fc01a12 --- /dev/null +++ b/src/lib/libcrypto/dh/Makefile.ssl | |||
| @@ -0,0 +1,133 @@ | |||
| 1 | # | ||
| 2 | # SSLeay/crypto/dh/Makefile | ||
| 3 | # | ||
| 4 | |||
| 5 | DIR= dh | ||
| 6 | TOP= ../.. | ||
| 7 | CC= cc | ||
| 8 | INCLUDES= -I.. -I$(TOP) -I../../include | ||
| 9 | CFLAG=-g | ||
| 10 | INSTALL_PREFIX= | ||
| 11 | OPENSSLDIR= /usr/local/ssl | ||
| 12 | INSTALLTOP=/usr/local/ssl | ||
| 13 | MAKE= make -f Makefile.ssl | ||
| 14 | MAKEDEPPROG= makedepend | ||
| 15 | MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG) | ||
| 16 | MAKEFILE= Makefile.ssl | ||
| 17 | AR= ar r | ||
| 18 | |||
| 19 | CFLAGS= $(INCLUDES) $(CFLAG) | ||
| 20 | |||
| 21 | GENERAL=Makefile | ||
| 22 | TEST= dhtest.c | ||
| 23 | APPS= | ||
| 24 | |||
| 25 | LIB=$(TOP)/libcrypto.a | ||
| 26 | LIBSRC= dh_asn1.c dh_gen.c dh_key.c dh_lib.c dh_check.c dh_err.c | ||
| 27 | LIBOBJ= dh_asn1.o dh_gen.o dh_key.o dh_lib.o dh_check.o dh_err.o | ||
| 28 | |||
| 29 | SRC= $(LIBSRC) | ||
| 30 | |||
| 31 | EXHEADER= dh.h | ||
| 32 | HEADER= $(EXHEADER) | ||
| 33 | |||
| 34 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
| 35 | |||
| 36 | top: | ||
| 37 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
| 38 | |||
| 39 | all: lib | ||
| 40 | |||
| 41 | lib: $(LIBOBJ) | ||
| 42 | $(AR) $(LIB) $(LIBOBJ) | ||
| 43 | $(RANLIB) $(LIB) || echo Never mind. | ||
| 44 | @touch lib | ||
| 45 | |||
| 46 | files: | ||
| 47 | $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO | ||
| 48 | |||
| 49 | links: | ||
| 50 | @sh $(TOP)/util/point.sh Makefile.ssl Makefile | ||
| 51 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
| 52 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
| 53 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
| 54 | |||
| 55 | install: | ||
| 56 | @for i in $(EXHEADER) ; \ | ||
| 57 | do \ | ||
| 58 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
| 59 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
| 60 | done; | ||
| 61 | |||
| 62 | tags: | ||
| 63 | ctags $(SRC) | ||
| 64 | |||
| 65 | tests: | ||
| 66 | |||
| 67 | lint: | ||
| 68 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
| 69 | |||
| 70 | depend: | ||
| 71 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
| 72 | |||
| 73 | dclean: | ||
| 74 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
| 75 | mv -f Makefile.new $(MAKEFILE) | ||
| 76 | |||
| 77 | clean: | ||
| 78 | rm -f *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
| 79 | |||
| 80 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
| 81 | |||
| 82 | dh_asn1.o: ../../e_os.h ../../include/openssl/asn1.h | ||
| 83 | dh_asn1.o: ../../include/openssl/asn1t.h ../../include/openssl/bio.h | ||
| 84 | dh_asn1.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h | ||
| 85 | dh_asn1.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h | ||
| 86 | dh_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
| 87 | dh_asn1.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
| 88 | dh_asn1.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | ||
| 89 | dh_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 90 | dh_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
| 91 | dh_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_asn1.c | ||
| 92 | dh_check.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h | ||
| 93 | dh_check.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
| 94 | dh_check.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h | ||
| 95 | dh_check.o: ../../include/openssl/err.h ../../include/openssl/lhash.h | ||
| 96 | dh_check.o: ../../include/openssl/opensslconf.h | ||
| 97 | dh_check.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 98 | dh_check.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
| 99 | dh_check.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_check.c | ||
| 100 | dh_err.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | ||
| 101 | dh_err.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h | ||
| 102 | dh_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
| 103 | dh_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h | ||
| 104 | dh_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 105 | dh_err.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
| 106 | dh_err.o: ../../include/openssl/symhacks.h dh_err.c | ||
| 107 | dh_gen.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h | ||
| 108 | dh_gen.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
| 109 | dh_gen.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h | ||
| 110 | dh_gen.o: ../../include/openssl/err.h ../../include/openssl/lhash.h | ||
| 111 | dh_gen.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | ||
| 112 | dh_gen.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h | ||
| 113 | dh_gen.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 114 | dh_gen.o: ../cryptlib.h dh_gen.c | ||
| 115 | dh_key.o: ../../e_os.h ../../include/openssl/bio.h ../../include/openssl/bn.h | ||
| 116 | dh_key.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
| 117 | dh_key.o: ../../include/openssl/dh.h ../../include/openssl/e_os2.h | ||
| 118 | dh_key.o: ../../include/openssl/err.h ../../include/openssl/lhash.h | ||
| 119 | dh_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | ||
| 120 | dh_key.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h | ||
| 121 | dh_key.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
| 122 | dh_key.o: ../../include/openssl/symhacks.h ../cryptlib.h dh_key.c | ||
| 123 | dh_lib.o: ../../e_os.h ../../include/openssl/asn1.h ../../include/openssl/bio.h | ||
| 124 | dh_lib.o: ../../include/openssl/bn.h ../../include/openssl/buffer.h | ||
| 125 | dh_lib.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h | ||
| 126 | dh_lib.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h | ||
| 127 | dh_lib.o: ../../include/openssl/engine.h ../../include/openssl/err.h | ||
| 128 | dh_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h | ||
| 129 | dh_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 130 | dh_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h | ||
| 131 | dh_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
| 132 | dh_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | ||
| 133 | dh_lib.o: ../cryptlib.h dh_lib.c | ||
diff --git a/src/lib/libcrypto/dh/dh.h b/src/lib/libcrypto/dh/dh.h new file mode 100644 index 0000000000..10475ac4b3 --- /dev/null +++ b/src/lib/libcrypto/dh/dh.h | |||
| @@ -0,0 +1,245 @@ | |||
| 1 | /* crypto/dh/dh.h */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #ifndef HEADER_DH_H | ||
| 60 | #define HEADER_DH_H | ||
| 61 | |||
| 62 | #include <openssl/e_os2.h> | ||
| 63 | |||
| 64 | #ifdef OPENSSL_NO_DH | ||
| 65 | #error DH is disabled. | ||
| 66 | #endif | ||
| 67 | |||
| 68 | #ifndef OPENSSL_NO_BIO | ||
| 69 | #include <openssl/bio.h> | ||
| 70 | #endif | ||
| 71 | #include <openssl/ossl_typ.h> | ||
| 72 | #ifndef OPENSSL_NO_DEPRECATED | ||
| 73 | #include <openssl/bn.h> | ||
| 74 | #endif | ||
| 75 | |||
| 76 | #ifndef OPENSSL_DH_MAX_MODULUS_BITS | ||
| 77 | # define OPENSSL_DH_MAX_MODULUS_BITS 10000 | ||
| 78 | #endif | ||
| 79 | |||
| 80 | #define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024 | ||
| 81 | |||
| 82 | #define DH_FLAG_CACHE_MONT_P 0x01 | ||
| 83 | #define DH_FLAG_NO_EXP_CONSTTIME 0x02 /* new with 0.9.7h; the built-in DH | ||
| 84 | * implementation now uses constant time | ||
| 85 | * modular exponentiation for secret exponents | ||
| 86 | * by default. This flag causes the | ||
| 87 | * faster variable sliding window method to | ||
| 88 | * be used for all exponents. | ||
| 89 | */ | ||
| 90 | |||
| 91 | #ifdef __cplusplus | ||
| 92 | extern "C" { | ||
| 93 | #endif | ||
| 94 | |||
| 95 | /* Already defined in ossl_typ.h */ | ||
| 96 | /* typedef struct dh_st DH; */ | ||
| 97 | /* typedef struct dh_method DH_METHOD; */ | ||
| 98 | |||
| 99 | struct dh_method | ||
| 100 | { | ||
| 101 | const char *name; | ||
| 102 | /* Methods here */ | ||
| 103 | int (*generate_key)(DH *dh); | ||
| 104 | int (*compute_key)(unsigned char *key,const BIGNUM *pub_key,DH *dh); | ||
| 105 | int (*bn_mod_exp)(const DH *dh, BIGNUM *r, const BIGNUM *a, | ||
| 106 | const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, | ||
| 107 | BN_MONT_CTX *m_ctx); /* Can be null */ | ||
| 108 | |||
| 109 | int (*init)(DH *dh); | ||
| 110 | int (*finish)(DH *dh); | ||
| 111 | int flags; | ||
| 112 | char *app_data; | ||
| 113 | /* If this is non-NULL, it will be used to generate parameters */ | ||
| 114 | int (*generate_params)(DH *dh, int prime_len, int generator, BN_GENCB *cb); | ||
| 115 | }; | ||
| 116 | |||
| 117 | struct dh_st | ||
| 118 | { | ||
| 119 | /* This first argument is used to pick up errors when | ||
| 120 | * a DH is passed instead of a EVP_PKEY */ | ||
| 121 | int pad; | ||
| 122 | int version; | ||
| 123 | BIGNUM *p; | ||
| 124 | BIGNUM *g; | ||
| 125 | long length; /* optional */ | ||
| 126 | BIGNUM *pub_key; /* g^x */ | ||
| 127 | BIGNUM *priv_key; /* x */ | ||
| 128 | |||
| 129 | int flags; | ||
| 130 | BN_MONT_CTX *method_mont_p; | ||
| 131 | /* Place holders if we want to do X9.42 DH */ | ||
| 132 | BIGNUM *q; | ||
| 133 | BIGNUM *j; | ||
| 134 | unsigned char *seed; | ||
| 135 | int seedlen; | ||
| 136 | BIGNUM *counter; | ||
| 137 | |||
| 138 | int references; | ||
| 139 | CRYPTO_EX_DATA ex_data; | ||
| 140 | const DH_METHOD *meth; | ||
| 141 | ENGINE *engine; | ||
| 142 | }; | ||
| 143 | |||
| 144 | #define DH_GENERATOR_2 2 | ||
| 145 | /* #define DH_GENERATOR_3 3 */ | ||
| 146 | #define DH_GENERATOR_5 5 | ||
| 147 | |||
| 148 | /* DH_check error codes */ | ||
| 149 | #define DH_CHECK_P_NOT_PRIME 0x01 | ||
| 150 | #define DH_CHECK_P_NOT_SAFE_PRIME 0x02 | ||
| 151 | #define DH_UNABLE_TO_CHECK_GENERATOR 0x04 | ||
| 152 | #define DH_NOT_SUITABLE_GENERATOR 0x08 | ||
| 153 | |||
| 154 | /* DH_check_pub_key error codes */ | ||
| 155 | #define DH_CHECK_PUBKEY_TOO_SMALL 0x01 | ||
| 156 | #define DH_CHECK_PUBKEY_TOO_LARGE 0x02 | ||
| 157 | |||
| 158 | /* primes p where (p-1)/2 is prime too are called "safe"; we define | ||
| 159 | this for backward compatibility: */ | ||
| 160 | #define DH_CHECK_P_NOT_STRONG_PRIME DH_CHECK_P_NOT_SAFE_PRIME | ||
| 161 | |||
| 162 | #define DHparams_dup(x) ASN1_dup_of_const(DH,i2d_DHparams,d2i_DHparams,x) | ||
| 163 | #define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \ | ||
| 164 | (char *(*)())d2i_DHparams,(fp),(unsigned char **)(x)) | ||
| 165 | #define i2d_DHparams_fp(fp,x) ASN1_i2d_fp(i2d_DHparams,(fp), \ | ||
| 166 | (unsigned char *)(x)) | ||
| 167 | #define d2i_DHparams_bio(bp,x) ASN1_d2i_bio_of(DH,DH_new,d2i_DHparams,bp,x) | ||
| 168 | #define i2d_DHparams_bio(bp,x) ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x) | ||
| 169 | |||
| 170 | const DH_METHOD *DH_OpenSSL(void); | ||
| 171 | |||
| 172 | #ifdef OPENSSL_FIPS | ||
| 173 | DH * FIPS_dh_new(void); | ||
| 174 | void FIPS_dh_free(DH *dh); | ||
| 175 | #endif | ||
| 176 | |||
| 177 | void DH_set_default_method(const DH_METHOD *meth); | ||
| 178 | const DH_METHOD *DH_get_default_method(void); | ||
| 179 | int DH_set_method(DH *dh, const DH_METHOD *meth); | ||
| 180 | DH *DH_new_method(ENGINE *engine); | ||
| 181 | |||
| 182 | DH * DH_new(void); | ||
| 183 | void DH_free(DH *dh); | ||
| 184 | int DH_up_ref(DH *dh); | ||
| 185 | int DH_size(const DH *dh); | ||
| 186 | int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | ||
| 187 | CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func); | ||
| 188 | int DH_set_ex_data(DH *d, int idx, void *arg); | ||
| 189 | void *DH_get_ex_data(DH *d, int idx); | ||
| 190 | |||
| 191 | /* Deprecated version */ | ||
| 192 | #ifndef OPENSSL_NO_DEPRECATED | ||
| 193 | DH * DH_generate_parameters(int prime_len,int generator, | ||
| 194 | void (*callback)(int,int,void *),void *cb_arg); | ||
| 195 | #endif /* !defined(OPENSSL_NO_DEPRECATED) */ | ||
| 196 | |||
| 197 | /* New version */ | ||
| 198 | int DH_generate_parameters_ex(DH *dh, int prime_len,int generator, BN_GENCB *cb); | ||
| 199 | |||
| 200 | int DH_check(const DH *dh,int *codes); | ||
| 201 | int DH_check_pub_key(const DH *dh,const BIGNUM *pub_key, int *codes); | ||
| 202 | int DH_generate_key(DH *dh); | ||
| 203 | int DH_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh); | ||
| 204 | DH * d2i_DHparams(DH **a,const unsigned char **pp, long length); | ||
| 205 | int i2d_DHparams(const DH *a,unsigned char **pp); | ||
| 206 | #ifndef OPENSSL_NO_FP_API | ||
| 207 | int DHparams_print_fp(FILE *fp, const DH *x); | ||
| 208 | #endif | ||
| 209 | #ifndef OPENSSL_NO_BIO | ||
| 210 | int DHparams_print(BIO *bp, const DH *x); | ||
| 211 | #else | ||
| 212 | int DHparams_print(char *bp, const DH *x); | ||
| 213 | #endif | ||
| 214 | |||
| 215 | /* BEGIN ERROR CODES */ | ||
| 216 | /* The following lines are auto generated by the script mkerr.pl. Any changes | ||
| 217 | * made after this point may be overwritten when the script is next run. | ||
| 218 | */ | ||
| 219 | void ERR_load_DH_strings(void); | ||
| 220 | |||
| 221 | /* Error codes for the DH functions. */ | ||
| 222 | |||
| 223 | /* Function codes. */ | ||
| 224 | #define DH_F_COMPUTE_KEY 102 | ||
| 225 | #define DH_F_DHPARAMS_PRINT 100 | ||
| 226 | #define DH_F_DHPARAMS_PRINT_FP 101 | ||
| 227 | #define DH_F_DH_BUILTIN_GENPARAMS 106 | ||
| 228 | #define DH_F_DH_COMPUTE_KEY 107 | ||
| 229 | #define DH_F_DH_GENERATE_KEY 108 | ||
| 230 | #define DH_F_DH_GENERATE_PARAMETERS 109 | ||
| 231 | #define DH_F_DH_NEW_METHOD 105 | ||
| 232 | #define DH_F_GENERATE_KEY 103 | ||
| 233 | #define DH_F_GENERATE_PARAMETERS 104 | ||
| 234 | |||
| 235 | /* Reason codes. */ | ||
| 236 | #define DH_R_BAD_GENERATOR 101 | ||
| 237 | #define DH_R_INVALID_PUBKEY 102 | ||
| 238 | #define DH_R_KEY_SIZE_TOO_SMALL 104 | ||
| 239 | #define DH_R_MODULUS_TOO_LARGE 103 | ||
| 240 | #define DH_R_NO_PRIVATE_VALUE 100 | ||
| 241 | |||
| 242 | #ifdef __cplusplus | ||
| 243 | } | ||
| 244 | #endif | ||
| 245 | #endif | ||
diff --git a/src/lib/libcrypto/dh/dh_asn1.c b/src/lib/libcrypto/dh/dh_asn1.c new file mode 100644 index 0000000000..76740af2bd --- /dev/null +++ b/src/lib/libcrypto/dh/dh_asn1.c | |||
| @@ -0,0 +1,87 @@ | |||
| 1 | /* dh_asn1.c */ | ||
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | ||
| 3 | * project 2000. | ||
| 4 | */ | ||
| 5 | /* ==================================================================== | ||
| 6 | * Copyright (c) 2000 The OpenSSL Project. All rights reserved. | ||
| 7 | * | ||
| 8 | * Redistribution and use in source and binary forms, with or without | ||
| 9 | * modification, are permitted provided that the following conditions | ||
| 10 | * are met: | ||
| 11 | * | ||
| 12 | * 1. Redistributions of source code must retain the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer. | ||
| 14 | * | ||
| 15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 16 | * notice, this list of conditions and the following disclaimer in | ||
| 17 | * the documentation and/or other materials provided with the | ||
| 18 | * distribution. | ||
| 19 | * | ||
| 20 | * 3. All advertising materials mentioning features or use of this | ||
| 21 | * software must display the following acknowledgment: | ||
| 22 | * "This product includes software developed by the OpenSSL Project | ||
| 23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 24 | * | ||
| 25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 26 | * endorse or promote products derived from this software without | ||
| 27 | * prior written permission. For written permission, please contact | ||
| 28 | * licensing@OpenSSL.org. | ||
| 29 | * | ||
| 30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 31 | * nor may "OpenSSL" appear in their names without prior written | ||
| 32 | * permission of the OpenSSL Project. | ||
| 33 | * | ||
| 34 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 35 | * acknowledgment: | ||
| 36 | * "This product includes software developed by the OpenSSL Project | ||
| 37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 38 | * | ||
| 39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 51 | * ==================================================================== | ||
| 52 | * | ||
| 53 | * This product includes cryptographic software written by Eric Young | ||
| 54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 55 | * Hudson (tjh@cryptsoft.com). | ||
| 56 | * | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include "cryptlib.h" | ||
| 61 | #include <openssl/bn.h> | ||
| 62 | #include <openssl/dh.h> | ||
| 63 | #include <openssl/objects.h> | ||
| 64 | #include <openssl/asn1t.h> | ||
| 65 | |||
| 66 | /* Override the default free and new methods */ | ||
| 67 | static int dh_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it) | ||
| 68 | { | ||
| 69 | if(operation == ASN1_OP_NEW_PRE) { | ||
| 70 | *pval = (ASN1_VALUE *)DH_new(); | ||
| 71 | if(*pval) return 2; | ||
| 72 | return 0; | ||
| 73 | } else if(operation == ASN1_OP_FREE_PRE) { | ||
| 74 | DH_free((DH *)*pval); | ||
| 75 | *pval = NULL; | ||
| 76 | return 2; | ||
| 77 | } | ||
| 78 | return 1; | ||
| 79 | } | ||
| 80 | |||
| 81 | ASN1_SEQUENCE_cb(DHparams, dh_cb) = { | ||
| 82 | ASN1_SIMPLE(DH, p, BIGNUM), | ||
| 83 | ASN1_SIMPLE(DH, g, BIGNUM), | ||
| 84 | ASN1_OPT(DH, length, ZLONG), | ||
| 85 | } ASN1_SEQUENCE_END_cb(DH, DHparams) | ||
| 86 | |||
| 87 | IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DH, DHparams, DHparams) | ||
diff --git a/src/lib/libcrypto/dh/dh_check.c b/src/lib/libcrypto/dh/dh_check.c new file mode 100644 index 0000000000..316cb9221d --- /dev/null +++ b/src/lib/libcrypto/dh/dh_check.c | |||
| @@ -0,0 +1,146 @@ | |||
| 1 | /* crypto/dh/dh_check.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include "cryptlib.h" | ||
| 61 | #include <openssl/bn.h> | ||
| 62 | #include <openssl/dh.h> | ||
| 63 | |||
| 64 | /* Check that p is a safe prime and | ||
| 65 | * if g is 2, 3 or 5, check that it is a suitable generator | ||
| 66 | * where | ||
| 67 | * for 2, p mod 24 == 11 | ||
| 68 | * for 3, p mod 12 == 5 | ||
| 69 | * for 5, p mod 10 == 3 or 7 | ||
| 70 | * should hold. | ||
| 71 | */ | ||
| 72 | |||
| 73 | #ifndef OPENSSL_FIPS | ||
| 74 | |||
| 75 | int DH_check(const DH *dh, int *ret) | ||
| 76 | { | ||
| 77 | int ok=0; | ||
| 78 | BN_CTX *ctx=NULL; | ||
| 79 | BN_ULONG l; | ||
| 80 | BIGNUM *q=NULL; | ||
| 81 | |||
| 82 | *ret=0; | ||
| 83 | ctx=BN_CTX_new(); | ||
| 84 | if (ctx == NULL) goto err; | ||
| 85 | q=BN_new(); | ||
| 86 | if (q == NULL) goto err; | ||
| 87 | |||
| 88 | if (BN_is_word(dh->g,DH_GENERATOR_2)) | ||
| 89 | { | ||
| 90 | l=BN_mod_word(dh->p,24); | ||
| 91 | if (l != 11) *ret|=DH_NOT_SUITABLE_GENERATOR; | ||
| 92 | } | ||
| 93 | #if 0 | ||
| 94 | else if (BN_is_word(dh->g,DH_GENERATOR_3)) | ||
| 95 | { | ||
| 96 | l=BN_mod_word(dh->p,12); | ||
| 97 | if (l != 5) *ret|=DH_NOT_SUITABLE_GENERATOR; | ||
| 98 | } | ||
| 99 | #endif | ||
| 100 | else if (BN_is_word(dh->g,DH_GENERATOR_5)) | ||
| 101 | { | ||
| 102 | l=BN_mod_word(dh->p,10); | ||
| 103 | if ((l != 3) && (l != 7)) | ||
| 104 | *ret|=DH_NOT_SUITABLE_GENERATOR; | ||
| 105 | } | ||
| 106 | else | ||
| 107 | *ret|=DH_UNABLE_TO_CHECK_GENERATOR; | ||
| 108 | |||
| 109 | if (!BN_is_prime_ex(dh->p,BN_prime_checks,ctx,NULL)) | ||
| 110 | *ret|=DH_CHECK_P_NOT_PRIME; | ||
| 111 | else | ||
| 112 | { | ||
| 113 | if (!BN_rshift1(q,dh->p)) goto err; | ||
| 114 | if (!BN_is_prime_ex(q,BN_prime_checks,ctx,NULL)) | ||
| 115 | *ret|=DH_CHECK_P_NOT_SAFE_PRIME; | ||
| 116 | } | ||
| 117 | ok=1; | ||
| 118 | err: | ||
| 119 | if (ctx != NULL) BN_CTX_free(ctx); | ||
| 120 | if (q != NULL) BN_free(q); | ||
| 121 | return(ok); | ||
| 122 | } | ||
| 123 | |||
| 124 | int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *ret) | ||
| 125 | { | ||
| 126 | int ok=0; | ||
| 127 | BIGNUM *q=NULL; | ||
| 128 | |||
| 129 | *ret=0; | ||
| 130 | q=BN_new(); | ||
| 131 | if (q == NULL) goto err; | ||
| 132 | BN_set_word(q,1); | ||
| 133 | if (BN_cmp(pub_key,q) <= 0) | ||
| 134 | *ret|=DH_CHECK_PUBKEY_TOO_SMALL; | ||
| 135 | BN_copy(q,dh->p); | ||
| 136 | BN_sub_word(q,1); | ||
| 137 | if (BN_cmp(pub_key,q) >= 0) | ||
| 138 | *ret|=DH_CHECK_PUBKEY_TOO_LARGE; | ||
| 139 | |||
| 140 | ok = 1; | ||
| 141 | err: | ||
| 142 | if (q != NULL) BN_free(q); | ||
| 143 | return(ok); | ||
| 144 | } | ||
| 145 | |||
| 146 | #endif | ||
diff --git a/src/lib/libcrypto/dh/dh_depr.c b/src/lib/libcrypto/dh/dh_depr.c new file mode 100644 index 0000000000..acc05f252c --- /dev/null +++ b/src/lib/libcrypto/dh/dh_depr.c | |||
| @@ -0,0 +1,83 @@ | |||
| 1 | /* crypto/dh/dh_depr.c */ | ||
| 2 | /* ==================================================================== | ||
| 3 | * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. | ||
| 4 | * | ||
| 5 | * Redistribution and use in source and binary forms, with or without | ||
| 6 | * modification, are permitted provided that the following conditions | ||
| 7 | * are met: | ||
| 8 | * | ||
| 9 | * 1. Redistributions of source code must retain the above copyright | ||
| 10 | * notice, this list of conditions and the following disclaimer. | ||
| 11 | * | ||
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer in | ||
| 14 | * the documentation and/or other materials provided with the | ||
| 15 | * distribution. | ||
| 16 | * | ||
| 17 | * 3. All advertising materials mentioning features or use of this | ||
| 18 | * software must display the following acknowledgment: | ||
| 19 | * "This product includes software developed by the OpenSSL Project | ||
| 20 | * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
| 21 | * | ||
| 22 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 23 | * endorse or promote products derived from this software without | ||
| 24 | * prior written permission. For written permission, please contact | ||
| 25 | * openssl-core@openssl.org. | ||
| 26 | * | ||
| 27 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 28 | * nor may "OpenSSL" appear in their names without prior written | ||
| 29 | * permission of the OpenSSL Project. | ||
| 30 | * | ||
| 31 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 32 | * acknowledgment: | ||
| 33 | * "This product includes software developed by the OpenSSL Project | ||
| 34 | * for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
| 35 | * | ||
| 36 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 37 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 38 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 39 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 40 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 41 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 42 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 43 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 44 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 45 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 46 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 47 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 48 | * ==================================================================== | ||
| 49 | * | ||
| 50 | * This product includes cryptographic software written by Eric Young | ||
| 51 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 52 | * Hudson (tjh@cryptsoft.com). | ||
| 53 | * | ||
| 54 | */ | ||
| 55 | |||
| 56 | |||
| 57 | /* This file contains deprecated functions as wrappers to the new ones */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include "cryptlib.h" | ||
| 61 | #include <openssl/bn.h> | ||
| 62 | #include <openssl/dh.h> | ||
| 63 | |||
| 64 | static void *dummy=&dummy; | ||
| 65 | |||
| 66 | #ifndef OPENSSL_NO_DEPRECATED | ||
| 67 | DH *DH_generate_parameters(int prime_len, int generator, | ||
| 68 | void (*callback)(int,int,void *), void *cb_arg) | ||
| 69 | { | ||
| 70 | BN_GENCB cb; | ||
| 71 | DH *ret=NULL; | ||
| 72 | |||
| 73 | if((ret=DH_new()) == NULL) | ||
| 74 | return NULL; | ||
| 75 | |||
| 76 | BN_GENCB_set_old(&cb, callback, cb_arg); | ||
| 77 | |||
| 78 | if(DH_generate_parameters_ex(ret, prime_len, generator, &cb)) | ||
| 79 | return ret; | ||
| 80 | DH_free(ret); | ||
| 81 | return NULL; | ||
| 82 | } | ||
| 83 | #endif | ||
diff --git a/src/lib/libcrypto/dh/dh_err.c b/src/lib/libcrypto/dh/dh_err.c new file mode 100644 index 0000000000..13263c81c1 --- /dev/null +++ b/src/lib/libcrypto/dh/dh_err.c | |||
| @@ -0,0 +1,108 @@ | |||
| 1 | /* crypto/dh/dh_err.c */ | ||
| 2 | /* ==================================================================== | ||
| 3 | * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. | ||
| 4 | * | ||
| 5 | * Redistribution and use in source and binary forms, with or without | ||
| 6 | * modification, are permitted provided that the following conditions | ||
| 7 | * are met: | ||
| 8 | * | ||
| 9 | * 1. Redistributions of source code must retain the above copyright | ||
| 10 | * notice, this list of conditions and the following disclaimer. | ||
| 11 | * | ||
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer in | ||
| 14 | * the documentation and/or other materials provided with the | ||
| 15 | * distribution. | ||
| 16 | * | ||
| 17 | * 3. All advertising materials mentioning features or use of this | ||
| 18 | * software must display the following acknowledgment: | ||
| 19 | * "This product includes software developed by the OpenSSL Project | ||
| 20 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 21 | * | ||
| 22 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 23 | * endorse or promote products derived from this software without | ||
| 24 | * prior written permission. For written permission, please contact | ||
| 25 | * openssl-core@OpenSSL.org. | ||
| 26 | * | ||
| 27 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 28 | * nor may "OpenSSL" appear in their names without prior written | ||
| 29 | * permission of the OpenSSL Project. | ||
| 30 | * | ||
| 31 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 32 | * acknowledgment: | ||
| 33 | * "This product includes software developed by the OpenSSL Project | ||
| 34 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 35 | * | ||
| 36 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 37 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 38 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 39 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 40 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 41 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 42 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 43 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 44 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 45 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 46 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 47 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 48 | * ==================================================================== | ||
| 49 | * | ||
| 50 | * This product includes cryptographic software written by Eric Young | ||
| 51 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 52 | * Hudson (tjh@cryptsoft.com). | ||
| 53 | * | ||
| 54 | */ | ||
| 55 | |||
| 56 | /* NOTE: this file was auto generated by the mkerr.pl script: any changes | ||
| 57 | * made to it will be overwritten when the script next updates this file, | ||
| 58 | * only reason strings will be preserved. | ||
| 59 | */ | ||
| 60 | |||
| 61 | #include <stdio.h> | ||
| 62 | #include <openssl/err.h> | ||
| 63 | #include <openssl/dh.h> | ||
| 64 | |||
| 65 | /* BEGIN ERROR CODES */ | ||
| 66 | #ifndef OPENSSL_NO_ERR | ||
| 67 | |||
| 68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_DH,func,0) | ||
| 69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_DH,0,reason) | ||
| 70 | |||
| 71 | static ERR_STRING_DATA DH_str_functs[]= | ||
| 72 | { | ||
| 73 | {ERR_FUNC(DH_F_COMPUTE_KEY), "COMPUTE_KEY"}, | ||
| 74 | {ERR_FUNC(DH_F_DHPARAMS_PRINT), "DHparams_print"}, | ||
| 75 | {ERR_FUNC(DH_F_DHPARAMS_PRINT_FP), "DHparams_print_fp"}, | ||
| 76 | {ERR_FUNC(DH_F_DH_BUILTIN_GENPARAMS), "DH_BUILTIN_GENPARAMS"}, | ||
| 77 | {ERR_FUNC(DH_F_DH_COMPUTE_KEY), "DH_compute_key"}, | ||
| 78 | {ERR_FUNC(DH_F_DH_GENERATE_KEY), "DH_generate_key"}, | ||
| 79 | {ERR_FUNC(DH_F_DH_GENERATE_PARAMETERS), "DH_generate_parameters"}, | ||
| 80 | {ERR_FUNC(DH_F_DH_NEW_METHOD), "DH_new_method"}, | ||
| 81 | {ERR_FUNC(DH_F_GENERATE_KEY), "GENERATE_KEY"}, | ||
| 82 | {ERR_FUNC(DH_F_GENERATE_PARAMETERS), "GENERATE_PARAMETERS"}, | ||
| 83 | {0,NULL} | ||
| 84 | }; | ||
| 85 | |||
| 86 | static ERR_STRING_DATA DH_str_reasons[]= | ||
| 87 | { | ||
| 88 | {ERR_REASON(DH_R_BAD_GENERATOR) ,"bad generator"}, | ||
| 89 | {ERR_REASON(DH_R_INVALID_PUBKEY) ,"invalid public key"}, | ||
| 90 | {ERR_REASON(DH_R_KEY_SIZE_TOO_SMALL) ,"key size too small"}, | ||
| 91 | {ERR_REASON(DH_R_MODULUS_TOO_LARGE) ,"modulus too large"}, | ||
| 92 | {ERR_REASON(DH_R_NO_PRIVATE_VALUE) ,"no private value"}, | ||
| 93 | {0,NULL} | ||
| 94 | }; | ||
| 95 | |||
| 96 | #endif | ||
| 97 | |||
| 98 | void ERR_load_DH_strings(void) | ||
| 99 | { | ||
| 100 | #ifndef OPENSSL_NO_ERR | ||
| 101 | |||
| 102 | if (ERR_func_error_string(DH_str_functs[0].error) == NULL) | ||
| 103 | { | ||
| 104 | ERR_load_strings(0,DH_str_functs); | ||
| 105 | ERR_load_strings(0,DH_str_reasons); | ||
| 106 | } | ||
| 107 | #endif | ||
| 108 | } | ||
diff --git a/src/lib/libcrypto/dh/dh_gen.c b/src/lib/libcrypto/dh/dh_gen.c new file mode 100644 index 0000000000..999e1deb40 --- /dev/null +++ b/src/lib/libcrypto/dh/dh_gen.c | |||
| @@ -0,0 +1,179 @@ | |||
| 1 | /* crypto/dh/dh_gen.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | /* NB: These functions have been upgraded - the previous prototypes are in | ||
| 60 | * dh_depr.c as wrappers to these ones. | ||
| 61 | * - Geoff | ||
| 62 | */ | ||
| 63 | |||
| 64 | #include <stdio.h> | ||
| 65 | #include "cryptlib.h" | ||
| 66 | #include <openssl/bn.h> | ||
| 67 | #include <openssl/dh.h> | ||
| 68 | |||
| 69 | #ifndef OPENSSL_FIPS | ||
| 70 | |||
| 71 | static int dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB *cb); | ||
| 72 | |||
| 73 | int DH_generate_parameters_ex(DH *ret, int prime_len, int generator, BN_GENCB *cb) | ||
| 74 | { | ||
| 75 | if(ret->meth->generate_params) | ||
| 76 | return ret->meth->generate_params(ret, prime_len, generator, cb); | ||
| 77 | return dh_builtin_genparams(ret, prime_len, generator, cb); | ||
| 78 | } | ||
| 79 | |||
| 80 | /* We generate DH parameters as follows | ||
| 81 | * find a prime q which is prime_len/2 bits long. | ||
| 82 | * p=(2*q)+1 or (p-1)/2 = q | ||
| 83 | * For this case, g is a generator if | ||
| 84 | * g^((p-1)/q) mod p != 1 for values of q which are the factors of p-1. | ||
| 85 | * Since the factors of p-1 are q and 2, we just need to check | ||
| 86 | * g^2 mod p != 1 and g^q mod p != 1. | ||
| 87 | * | ||
| 88 | * Having said all that, | ||
| 89 | * there is another special case method for the generators 2, 3 and 5. | ||
| 90 | * for 2, p mod 24 == 11 | ||
| 91 | * for 3, p mod 12 == 5 <<<<< does not work for safe primes. | ||
| 92 | * for 5, p mod 10 == 3 or 7 | ||
| 93 | * | ||
| 94 | * Thanks to Phil Karn <karn@qualcomm.com> for the pointers about the | ||
| 95 | * special generators and for answering some of my questions. | ||
| 96 | * | ||
| 97 | * I've implemented the second simple method :-). | ||
| 98 | * Since DH should be using a safe prime (both p and q are prime), | ||
| 99 | * this generator function can take a very very long time to run. | ||
| 100 | */ | ||
| 101 | /* Actually there is no reason to insist that 'generator' be a generator. | ||
| 102 | * It's just as OK (and in some sense better) to use a generator of the | ||
| 103 | * order-q subgroup. | ||
| 104 | */ | ||
| 105 | static int dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB *cb) | ||
| 106 | { | ||
| 107 | BIGNUM *t1,*t2; | ||
| 108 | int g,ok= -1; | ||
| 109 | BN_CTX *ctx=NULL; | ||
| 110 | |||
| 111 | ctx=BN_CTX_new(); | ||
| 112 | if (ctx == NULL) goto err; | ||
| 113 | BN_CTX_start(ctx); | ||
| 114 | t1 = BN_CTX_get(ctx); | ||
| 115 | t2 = BN_CTX_get(ctx); | ||
| 116 | if (t1 == NULL || t2 == NULL) goto err; | ||
| 117 | |||
| 118 | /* Make sure 'ret' has the necessary elements */ | ||
| 119 | if(!ret->p && ((ret->p = BN_new()) == NULL)) goto err; | ||
| 120 | if(!ret->g && ((ret->g = BN_new()) == NULL)) goto err; | ||
| 121 | |||
| 122 | if (generator <= 1) | ||
| 123 | { | ||
| 124 | DHerr(DH_F_DH_BUILTIN_GENPARAMS, DH_R_BAD_GENERATOR); | ||
| 125 | goto err; | ||
| 126 | } | ||
| 127 | if (generator == DH_GENERATOR_2) | ||
| 128 | { | ||
| 129 | if (!BN_set_word(t1,24)) goto err; | ||
| 130 | if (!BN_set_word(t2,11)) goto err; | ||
| 131 | g=2; | ||
| 132 | } | ||
| 133 | #if 0 /* does not work for safe primes */ | ||
| 134 | else if (generator == DH_GENERATOR_3) | ||
| 135 | { | ||
| 136 | if (!BN_set_word(t1,12)) goto err; | ||
| 137 | if (!BN_set_word(t2,5)) goto err; | ||
| 138 | g=3; | ||
| 139 | } | ||
| 140 | #endif | ||
| 141 | else if (generator == DH_GENERATOR_5) | ||
| 142 | { | ||
| 143 | if (!BN_set_word(t1,10)) goto err; | ||
| 144 | if (!BN_set_word(t2,3)) goto err; | ||
| 145 | /* BN_set_word(t3,7); just have to miss | ||
| 146 | * out on these ones :-( */ | ||
| 147 | g=5; | ||
| 148 | } | ||
| 149 | else | ||
| 150 | { | ||
| 151 | /* in the general case, don't worry if 'generator' is a | ||
| 152 | * generator or not: since we are using safe primes, | ||
| 153 | * it will generate either an order-q or an order-2q group, | ||
| 154 | * which both is OK */ | ||
| 155 | if (!BN_set_word(t1,2)) goto err; | ||
| 156 | if (!BN_set_word(t2,1)) goto err; | ||
| 157 | g=generator; | ||
| 158 | } | ||
| 159 | |||
| 160 | if(!BN_generate_prime_ex(ret->p,prime_len,1,t1,t2,cb)) goto err; | ||
| 161 | if(!BN_GENCB_call(cb, 3, 0)) goto err; | ||
| 162 | if (!BN_set_word(ret->g,g)) goto err; | ||
| 163 | ok=1; | ||
| 164 | err: | ||
| 165 | if (ok == -1) | ||
| 166 | { | ||
| 167 | DHerr(DH_F_DH_BUILTIN_GENPARAMS,ERR_R_BN_LIB); | ||
| 168 | ok=0; | ||
| 169 | } | ||
| 170 | |||
| 171 | if (ctx != NULL) | ||
| 172 | { | ||
| 173 | BN_CTX_end(ctx); | ||
| 174 | BN_CTX_free(ctx); | ||
| 175 | } | ||
| 176 | return ok; | ||
| 177 | } | ||
| 178 | |||
| 179 | #endif | ||
diff --git a/src/lib/libcrypto/dh/dh_key.c b/src/lib/libcrypto/dh/dh_key.c new file mode 100644 index 0000000000..79dd331863 --- /dev/null +++ b/src/lib/libcrypto/dh/dh_key.c | |||
| @@ -0,0 +1,267 @@ | |||
| 1 | /* crypto/dh/dh_key.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include "cryptlib.h" | ||
| 61 | #include <openssl/bn.h> | ||
| 62 | #include <openssl/rand.h> | ||
| 63 | #include <openssl/dh.h> | ||
| 64 | |||
| 65 | #ifndef OPENSSL_FIPS | ||
| 66 | |||
| 67 | static int generate_key(DH *dh); | ||
| 68 | static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh); | ||
| 69 | static int dh_bn_mod_exp(const DH *dh, BIGNUM *r, | ||
| 70 | const BIGNUM *a, const BIGNUM *p, | ||
| 71 | const BIGNUM *m, BN_CTX *ctx, | ||
| 72 | BN_MONT_CTX *m_ctx); | ||
| 73 | static int dh_init(DH *dh); | ||
| 74 | static int dh_finish(DH *dh); | ||
| 75 | |||
| 76 | int DH_generate_key(DH *dh) | ||
| 77 | { | ||
| 78 | return dh->meth->generate_key(dh); | ||
| 79 | } | ||
| 80 | |||
| 81 | int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) | ||
| 82 | { | ||
| 83 | return dh->meth->compute_key(key, pub_key, dh); | ||
| 84 | } | ||
| 85 | |||
| 86 | static DH_METHOD dh_ossl = { | ||
| 87 | "OpenSSL DH Method", | ||
| 88 | generate_key, | ||
| 89 | compute_key, | ||
| 90 | dh_bn_mod_exp, | ||
| 91 | dh_init, | ||
| 92 | dh_finish, | ||
| 93 | 0, | ||
| 94 | NULL, | ||
| 95 | NULL | ||
| 96 | }; | ||
| 97 | |||
| 98 | const DH_METHOD *DH_OpenSSL(void) | ||
| 99 | { | ||
| 100 | return &dh_ossl; | ||
| 101 | } | ||
| 102 | |||
| 103 | static int generate_key(DH *dh) | ||
| 104 | { | ||
| 105 | int ok=0; | ||
| 106 | int generate_new_key=0; | ||
| 107 | unsigned l; | ||
| 108 | BN_CTX *ctx; | ||
| 109 | BN_MONT_CTX *mont=NULL; | ||
| 110 | BIGNUM *pub_key=NULL,*priv_key=NULL; | ||
| 111 | |||
| 112 | ctx = BN_CTX_new(); | ||
| 113 | if (ctx == NULL) goto err; | ||
| 114 | |||
| 115 | if (dh->priv_key == NULL) | ||
| 116 | { | ||
| 117 | priv_key=BN_new(); | ||
| 118 | if (priv_key == NULL) goto err; | ||
| 119 | generate_new_key=1; | ||
| 120 | } | ||
| 121 | else | ||
| 122 | priv_key=dh->priv_key; | ||
| 123 | |||
| 124 | if (dh->pub_key == NULL) | ||
| 125 | { | ||
| 126 | pub_key=BN_new(); | ||
| 127 | if (pub_key == NULL) goto err; | ||
| 128 | } | ||
| 129 | else | ||
| 130 | pub_key=dh->pub_key; | ||
| 131 | |||
| 132 | |||
| 133 | if (dh->flags & DH_FLAG_CACHE_MONT_P) | ||
| 134 | { | ||
| 135 | mont = BN_MONT_CTX_set_locked(&dh->method_mont_p, | ||
| 136 | CRYPTO_LOCK_DH, dh->p, ctx); | ||
| 137 | if (!mont) | ||
| 138 | goto err; | ||
| 139 | } | ||
| 140 | |||
| 141 | if (generate_new_key) | ||
| 142 | { | ||
| 143 | l = dh->length ? dh->length : BN_num_bits(dh->p)-1; /* secret exponent length */ | ||
| 144 | if (!BN_rand(priv_key, l, 0, 0)) goto err; | ||
| 145 | } | ||
| 146 | |||
| 147 | { | ||
| 148 | BIGNUM local_prk; | ||
| 149 | BIGNUM *prk; | ||
| 150 | |||
| 151 | if ((dh->flags & DH_FLAG_NO_EXP_CONSTTIME) == 0) | ||
| 152 | { | ||
| 153 | BN_init(&local_prk); | ||
| 154 | prk = &local_prk; | ||
| 155 | BN_with_flags(prk, priv_key, BN_FLG_CONSTTIME); | ||
| 156 | } | ||
| 157 | else | ||
| 158 | prk = priv_key; | ||
| 159 | |||
| 160 | if (!dh->meth->bn_mod_exp(dh, pub_key, dh->g, prk, dh->p, ctx, mont)) goto err; | ||
| 161 | } | ||
| 162 | |||
| 163 | dh->pub_key=pub_key; | ||
| 164 | dh->priv_key=priv_key; | ||
| 165 | ok=1; | ||
| 166 | err: | ||
| 167 | if (ok != 1) | ||
| 168 | DHerr(DH_F_GENERATE_KEY,ERR_R_BN_LIB); | ||
| 169 | |||
| 170 | if ((pub_key != NULL) && (dh->pub_key == NULL)) BN_free(pub_key); | ||
| 171 | if ((priv_key != NULL) && (dh->priv_key == NULL)) BN_free(priv_key); | ||
| 172 | BN_CTX_free(ctx); | ||
| 173 | return(ok); | ||
| 174 | } | ||
| 175 | |||
| 176 | static int compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) | ||
| 177 | { | ||
| 178 | BN_CTX *ctx=NULL; | ||
| 179 | BN_MONT_CTX *mont=NULL; | ||
| 180 | BIGNUM *tmp; | ||
| 181 | int ret= -1; | ||
| 182 | int check_result; | ||
| 183 | |||
| 184 | if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) | ||
| 185 | { | ||
| 186 | DHerr(DH_F_COMPUTE_KEY,DH_R_MODULUS_TOO_LARGE); | ||
| 187 | goto err; | ||
| 188 | } | ||
| 189 | |||
| 190 | ctx = BN_CTX_new(); | ||
| 191 | if (ctx == NULL) goto err; | ||
| 192 | BN_CTX_start(ctx); | ||
| 193 | tmp = BN_CTX_get(ctx); | ||
| 194 | |||
| 195 | if (dh->priv_key == NULL) | ||
| 196 | { | ||
| 197 | DHerr(DH_F_COMPUTE_KEY,DH_R_NO_PRIVATE_VALUE); | ||
| 198 | goto err; | ||
| 199 | } | ||
| 200 | |||
| 201 | if (dh->flags & DH_FLAG_CACHE_MONT_P) | ||
| 202 | { | ||
| 203 | mont = BN_MONT_CTX_set_locked(&dh->method_mont_p, | ||
| 204 | CRYPTO_LOCK_DH, dh->p, ctx); | ||
| 205 | if ((dh->flags & DH_FLAG_NO_EXP_CONSTTIME) == 0) | ||
| 206 | { | ||
| 207 | /* XXX */ | ||
| 208 | BN_set_flags(dh->priv_key, BN_FLG_CONSTTIME); | ||
| 209 | } | ||
| 210 | if (!mont) | ||
| 211 | goto err; | ||
| 212 | } | ||
| 213 | |||
| 214 | if (!DH_check_pub_key(dh, pub_key, &check_result) || check_result) | ||
| 215 | { | ||
| 216 | DHerr(DH_F_COMPUTE_KEY,DH_R_INVALID_PUBKEY); | ||
| 217 | goto err; | ||
| 218 | } | ||
| 219 | |||
| 220 | if (!dh->meth->bn_mod_exp(dh, tmp, pub_key, dh->priv_key,dh->p,ctx,mont)) | ||
| 221 | { | ||
| 222 | DHerr(DH_F_COMPUTE_KEY,ERR_R_BN_LIB); | ||
| 223 | goto err; | ||
| 224 | } | ||
| 225 | |||
| 226 | ret=BN_bn2bin(tmp,key); | ||
| 227 | err: | ||
| 228 | if (ctx != NULL) | ||
| 229 | { | ||
| 230 | BN_CTX_end(ctx); | ||
| 231 | BN_CTX_free(ctx); | ||
| 232 | } | ||
| 233 | return(ret); | ||
| 234 | } | ||
| 235 | |||
| 236 | static int dh_bn_mod_exp(const DH *dh, BIGNUM *r, | ||
| 237 | const BIGNUM *a, const BIGNUM *p, | ||
| 238 | const BIGNUM *m, BN_CTX *ctx, | ||
| 239 | BN_MONT_CTX *m_ctx) | ||
| 240 | { | ||
| 241 | /* If a is only one word long and constant time is false, use the faster | ||
| 242 | * exponenentiation function. | ||
| 243 | */ | ||
| 244 | if (a->top == 1 && ((dh->flags & DH_FLAG_NO_EXP_CONSTTIME) != 0)) | ||
| 245 | { | ||
| 246 | BN_ULONG A = a->d[0]; | ||
| 247 | return BN_mod_exp_mont_word(r,A,p,m,ctx,m_ctx); | ||
| 248 | } | ||
| 249 | else | ||
| 250 | return BN_mod_exp_mont(r,a,p,m,ctx,m_ctx); | ||
| 251 | } | ||
| 252 | |||
| 253 | |||
| 254 | static int dh_init(DH *dh) | ||
| 255 | { | ||
| 256 | dh->flags |= DH_FLAG_CACHE_MONT_P; | ||
| 257 | return(1); | ||
| 258 | } | ||
| 259 | |||
| 260 | static int dh_finish(DH *dh) | ||
| 261 | { | ||
| 262 | if(dh->method_mont_p) | ||
| 263 | BN_MONT_CTX_free(dh->method_mont_p); | ||
| 264 | return(1); | ||
| 265 | } | ||
| 266 | |||
| 267 | #endif | ||
diff --git a/src/lib/libcrypto/dh/dh_lib.c b/src/lib/libcrypto/dh/dh_lib.c new file mode 100644 index 0000000000..7aef080e7a --- /dev/null +++ b/src/lib/libcrypto/dh/dh_lib.c | |||
| @@ -0,0 +1,247 @@ | |||
| 1 | /* crypto/dh/dh_lib.c */ | ||
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | ||
| 3 | * All rights reserved. | ||
| 4 | * | ||
| 5 | * This package is an SSL implementation written | ||
| 6 | * by Eric Young (eay@cryptsoft.com). | ||
| 7 | * The implementation was written so as to conform with Netscapes SSL. | ||
| 8 | * | ||
| 9 | * This library is free for commercial and non-commercial use as long as | ||
| 10 | * the following conditions are aheared to. The following conditions | ||
| 11 | * apply to all code found in this distribution, be it the RC4, RSA, | ||
| 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | ||
| 13 | * included with this distribution is covered by the same copyright terms | ||
| 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | ||
| 15 | * | ||
| 16 | * Copyright remains Eric Young's, and as such any Copyright notices in | ||
| 17 | * the code are not to be removed. | ||
| 18 | * If this package is used in a product, Eric Young should be given attribution | ||
| 19 | * as the author of the parts of the library used. | ||
| 20 | * This can be in the form of a textual message at program startup or | ||
| 21 | * in documentation (online or textual) provided with the package. | ||
| 22 | * | ||
| 23 | * Redistribution and use in source and binary forms, with or without | ||
| 24 | * modification, are permitted provided that the following conditions | ||
| 25 | * are met: | ||
| 26 | * 1. Redistributions of source code must retain the copyright | ||
| 27 | * notice, this list of conditions and the following disclaimer. | ||
| 28 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 29 | * notice, this list of conditions and the following disclaimer in the | ||
| 30 | * documentation and/or other materials provided with the distribution. | ||
| 31 | * 3. All advertising materials mentioning features or use of this software | ||
| 32 | * must display the following acknowledgement: | ||
| 33 | * "This product includes cryptographic software written by | ||
| 34 | * Eric Young (eay@cryptsoft.com)" | ||
| 35 | * The word 'cryptographic' can be left out if the rouines from the library | ||
| 36 | * being used are not cryptographic related :-). | ||
| 37 | * 4. If you include any Windows specific code (or a derivative thereof) from | ||
| 38 | * the apps directory (application code) you must include an acknowledgement: | ||
| 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | ||
| 40 | * | ||
| 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | ||
| 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| 44 | * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE | ||
| 45 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| 46 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
| 47 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 48 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
| 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
| 51 | * SUCH DAMAGE. | ||
| 52 | * | ||
| 53 | * The licence and distribution terms for any publically available version or | ||
| 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | ||
| 55 | * copied and put under another distribution licence | ||
| 56 | * [including the GNU Public Licence.] | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include "cryptlib.h" | ||
| 61 | #include <openssl/bn.h> | ||
| 62 | #include <openssl/dh.h> | ||
| 63 | #ifndef OPENSSL_NO_ENGINE | ||
| 64 | #include <openssl/engine.h> | ||
| 65 | #endif | ||
| 66 | |||
| 67 | const char DH_version[]="Diffie-Hellman" OPENSSL_VERSION_PTEXT; | ||
| 68 | |||
| 69 | static const DH_METHOD *default_DH_method = NULL; | ||
| 70 | |||
| 71 | void DH_set_default_method(const DH_METHOD *meth) | ||
| 72 | { | ||
| 73 | default_DH_method = meth; | ||
| 74 | } | ||
| 75 | |||
| 76 | const DH_METHOD *DH_get_default_method(void) | ||
| 77 | { | ||
| 78 | if(!default_DH_method) | ||
| 79 | default_DH_method = DH_OpenSSL(); | ||
| 80 | return default_DH_method; | ||
| 81 | } | ||
| 82 | |||
| 83 | int DH_set_method(DH *dh, const DH_METHOD *meth) | ||
| 84 | { | ||
| 85 | /* NB: The caller is specifically setting a method, so it's not up to us | ||
| 86 | * to deal with which ENGINE it comes from. */ | ||
| 87 | const DH_METHOD *mtmp; | ||
| 88 | mtmp = dh->meth; | ||
| 89 | if (mtmp->finish) mtmp->finish(dh); | ||
| 90 | #ifndef OPENSSL_NO_ENGINE | ||
| 91 | if (dh->engine) | ||
| 92 | { | ||
| 93 | ENGINE_finish(dh->engine); | ||
| 94 | dh->engine = NULL; | ||
| 95 | } | ||
| 96 | #endif | ||
| 97 | dh->meth = meth; | ||
| 98 | if (meth->init) meth->init(dh); | ||
| 99 | return 1; | ||
| 100 | } | ||
| 101 | |||
| 102 | DH *DH_new(void) | ||
| 103 | { | ||
| 104 | return DH_new_method(NULL); | ||
| 105 | } | ||
| 106 | |||
| 107 | DH *DH_new_method(ENGINE *engine) | ||
| 108 | { | ||
| 109 | DH *ret; | ||
| 110 | |||
| 111 | ret=(DH *)OPENSSL_malloc(sizeof(DH)); | ||
| 112 | if (ret == NULL) | ||
| 113 | { | ||
| 114 | DHerr(DH_F_DH_NEW_METHOD,ERR_R_MALLOC_FAILURE); | ||
| 115 | return(NULL); | ||
| 116 | } | ||
| 117 | |||
| 118 | ret->meth = DH_get_default_method(); | ||
| 119 | #ifndef OPENSSL_NO_ENGINE | ||
| 120 | if (engine) | ||
| 121 | { | ||
| 122 | if (!ENGINE_init(engine)) | ||
| 123 | { | ||
| 124 | DHerr(DH_F_DH_NEW_METHOD, ERR_R_ENGINE_LIB); | ||
| 125 | OPENSSL_free(ret); | ||
| 126 | return NULL; | ||
| 127 | } | ||
| 128 | ret->engine = engine; | ||
| 129 | } | ||
| 130 | else | ||
| 131 | ret->engine = ENGINE_get_default_DH(); | ||
| 132 | if(ret->engine) | ||
| 133 | { | ||
| 134 | ret->meth = ENGINE_get_DH(ret->engine); | ||
| 135 | if(!ret->meth) | ||
| 136 | { | ||
| 137 | DHerr(DH_F_DH_NEW_METHOD,ERR_R_ENGINE_LIB); | ||
| 138 | ENGINE_finish(ret->engine); | ||
| 139 | OPENSSL_free(ret); | ||
| 140 | return NULL; | ||
| 141 | } | ||
| 142 | } | ||
| 143 | #endif | ||
| 144 | |||
| 145 | ret->pad=0; | ||
| 146 | ret->version=0; | ||
| 147 | ret->p=NULL; | ||
| 148 | ret->g=NULL; | ||
| 149 | ret->length=0; | ||
| 150 | ret->pub_key=NULL; | ||
| 151 | ret->priv_key=NULL; | ||
| 152 | ret->q=NULL; | ||
| 153 | ret->j=NULL; | ||
| 154 | ret->seed = NULL; | ||
| 155 | ret->seedlen = 0; | ||
| 156 | ret->counter = NULL; | ||
| 157 | ret->method_mont_p=NULL; | ||
| 158 | ret->references = 1; | ||
| 159 | ret->flags=ret->meth->flags; | ||
| 160 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_DH, ret, &ret->ex_data); | ||
| 161 | if ((ret->meth->init != NULL) && !ret->meth->init(ret)) | ||
| 162 | { | ||
| 163 | #ifndef OPENSSL_NO_ENGINE | ||
| 164 | if (ret->engine) | ||
| 165 | ENGINE_finish(ret->engine); | ||
| 166 | #endif | ||
| 167 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DH, ret, &ret->ex_data); | ||
| 168 | OPENSSL_free(ret); | ||
| 169 | ret=NULL; | ||
| 170 | } | ||
| 171 | return(ret); | ||
| 172 | } | ||
| 173 | |||
| 174 | void DH_free(DH *r) | ||
| 175 | { | ||
| 176 | int i; | ||
| 177 | if(r == NULL) return; | ||
| 178 | i = CRYPTO_add(&r->references, -1, CRYPTO_LOCK_DH); | ||
| 179 | #ifdef REF_PRINT | ||
| 180 | REF_PRINT("DH",r); | ||
| 181 | #endif | ||
| 182 | if (i > 0) return; | ||
| 183 | #ifdef REF_CHECK | ||
| 184 | if (i < 0) | ||
| 185 | { | ||
| 186 | fprintf(stderr,"DH_free, bad reference count\n"); | ||
| 187 | abort(); | ||
| 188 | } | ||
| 189 | #endif | ||
| 190 | |||
| 191 | if (r->meth->finish) | ||
| 192 | r->meth->finish(r); | ||
| 193 | #ifndef OPENSSL_NO_ENGINE | ||
| 194 | if (r->engine) | ||
| 195 | ENGINE_finish(r->engine); | ||
| 196 | #endif | ||
| 197 | |||
| 198 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_DH, r, &r->ex_data); | ||
| 199 | |||
| 200 | if (r->p != NULL) BN_clear_free(r->p); | ||
| 201 | if (r->g != NULL) BN_clear_free(r->g); | ||
| 202 | if (r->q != NULL) BN_clear_free(r->q); | ||
| 203 | if (r->j != NULL) BN_clear_free(r->j); | ||
| 204 | if (r->seed) OPENSSL_free(r->seed); | ||
| 205 | if (r->counter != NULL) BN_clear_free(r->counter); | ||
| 206 | if (r->pub_key != NULL) BN_clear_free(r->pub_key); | ||
| 207 | if (r->priv_key != NULL) BN_clear_free(r->priv_key); | ||
| 208 | OPENSSL_free(r); | ||
| 209 | } | ||
| 210 | |||
| 211 | int DH_up_ref(DH *r) | ||
| 212 | { | ||
| 213 | int i = CRYPTO_add(&r->references, 1, CRYPTO_LOCK_DH); | ||
| 214 | #ifdef REF_PRINT | ||
| 215 | REF_PRINT("DH",r); | ||
| 216 | #endif | ||
| 217 | #ifdef REF_CHECK | ||
| 218 | if (i < 2) | ||
| 219 | { | ||
| 220 | fprintf(stderr, "DH_up, bad reference count\n"); | ||
| 221 | abort(); | ||
| 222 | } | ||
| 223 | #endif | ||
| 224 | return ((i > 1) ? 1 : 0); | ||
| 225 | } | ||
| 226 | |||
| 227 | int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func, | ||
| 228 | CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func) | ||
| 229 | { | ||
| 230 | return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_DH, argl, argp, | ||
| 231 | new_func, dup_func, free_func); | ||
| 232 | } | ||
| 233 | |||
| 234 | int DH_set_ex_data(DH *d, int idx, void *arg) | ||
| 235 | { | ||
| 236 | return(CRYPTO_set_ex_data(&d->ex_data,idx,arg)); | ||
| 237 | } | ||
| 238 | |||
| 239 | void *DH_get_ex_data(DH *d, int idx) | ||
| 240 | { | ||
| 241 | return(CRYPTO_get_ex_data(&d->ex_data,idx)); | ||
| 242 | } | ||
| 243 | |||
| 244 | int DH_size(const DH *dh) | ||
| 245 | { | ||
| 246 | return(BN_num_bytes(dh->p)); | ||
| 247 | } | ||
