diff options
Diffstat (limited to 'src/lib/libcrypto/rand')
| -rw-r--r-- | src/lib/libcrypto/rand/Makefile | 71 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/Makefile.ssl | 196 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/md_rand.c | 12 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand.h | 140 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_err.c | 96 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_lcl.h | 11 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_lib.c | 176 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_nw.c | 183 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_unix.c | 10 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/randfile.c | 287 |
10 files changed, 1104 insertions, 78 deletions
diff --git a/src/lib/libcrypto/rand/Makefile b/src/lib/libcrypto/rand/Makefile index 30794305cb..27694aa664 100644 --- a/src/lib/libcrypto/rand/Makefile +++ b/src/lib/libcrypto/rand/Makefile | |||
| @@ -17,9 +17,9 @@ TEST= randtest.c | |||
| 17 | APPS= | 17 | APPS= |
| 18 | 18 | ||
| 19 | LIB=$(TOP)/libcrypto.a | 19 | LIB=$(TOP)/libcrypto.a |
| 20 | LIBSRC=md_rand.c randfile.c rand_lib.c rand_eng.c rand_err.c rand_egd.c \ | 20 | LIBSRC=md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \ |
| 21 | rand_win.c rand_unix.c rand_os2.c rand_nw.c | 21 | rand_win.c rand_unix.c rand_os2.c rand_nw.c |
| 22 | LIBOBJ=md_rand.o randfile.o rand_lib.o rand_eng.o rand_err.o rand_egd.o \ | 22 | LIBOBJ=md_rand.o randfile.o rand_lib.o rand_err.o rand_egd.o \ |
| 23 | rand_win.o rand_unix.o rand_os2.o rand_nw.o | 23 | rand_win.o rand_unix.o rand_os2.o rand_nw.o |
| 24 | 24 | ||
| 25 | SRC= $(LIBSRC) | 25 | SRC= $(LIBSRC) |
| @@ -35,7 +35,7 @@ top: | |||
| 35 | all: lib | 35 | all: lib |
| 36 | 36 | ||
| 37 | lib: $(LIBOBJ) | 37 | lib: $(LIBOBJ) |
| 38 | $(ARX) $(LIB) $(LIBOBJ) | 38 | $(AR) $(LIB) $(LIBOBJ) |
| 39 | $(RANLIB) $(LIB) || echo Never mind. | 39 | $(RANLIB) $(LIB) || echo Never mind. |
| 40 | @touch lib | 40 | @touch lib |
| 41 | 41 | ||
| @@ -79,34 +79,17 @@ clean: | |||
| 79 | md_rand.o: ../../e_os.h ../../include/openssl/asn1.h | 79 | md_rand.o: ../../e_os.h ../../include/openssl/asn1.h |
| 80 | md_rand.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h | 80 | md_rand.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h |
| 81 | md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | 81 | md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h |
| 82 | md_rand.o: ../../include/openssl/evp.h ../../include/openssl/fips.h | 82 | md_rand.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h |
| 83 | md_rand.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 83 | md_rand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h |
| 84 | md_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | 84 | md_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h |
| 85 | md_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 85 | md_rand.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h |
| 86 | md_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h | 86 | md_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h |
| 87 | md_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | 87 | md_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
| 88 | md_rand.o: ../../include/openssl/symhacks.h md_rand.c rand_lcl.h | 88 | md_rand.o: md_rand.c rand_lcl.h |
| 89 | rand_egd.o: ../../include/openssl/buffer.h ../../include/openssl/e_os2.h | 89 | rand_egd.o: ../../include/openssl/buffer.h ../../include/openssl/e_os2.h |
| 90 | rand_egd.o: ../../include/openssl/opensslconf.h | 90 | rand_egd.o: ../../include/openssl/opensslconf.h |
| 91 | rand_egd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h | 91 | rand_egd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h |
| 92 | rand_egd.o: rand_egd.c | 92 | rand_egd.o: rand_egd.c |
| 93 | rand_eng.o: ../../e_os.h ../../include/openssl/asn1.h | ||
| 94 | rand_eng.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | ||
| 95 | rand_eng.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | ||
| 96 | rand_eng.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | ||
| 97 | rand_eng.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h | ||
| 98 | rand_eng.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h | ||
| 99 | rand_eng.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
| 100 | rand_eng.o: ../../include/openssl/fips.h ../../include/openssl/fips_rand.h | ||
| 101 | rand_eng.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | ||
| 102 | rand_eng.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | ||
| 103 | rand_eng.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 104 | rand_eng.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h | ||
| 105 | rand_eng.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 106 | rand_eng.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 107 | rand_eng.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
| 108 | rand_eng.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h | ||
| 109 | rand_eng.o: ../cryptlib.h rand_eng.c rand_lcl.h | ||
| 110 | rand_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h | 93 | rand_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h |
| 111 | rand_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | 94 | rand_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h |
| 112 | rand_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h | 95 | rand_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h |
| @@ -116,39 +99,34 @@ rand_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | |||
| 116 | rand_err.o: rand_err.c | 99 | rand_err.o: rand_err.c |
| 117 | rand_lib.o: ../../e_os.h ../../include/openssl/asn1.h | 100 | rand_lib.o: ../../e_os.h ../../include/openssl/asn1.h |
| 118 | rand_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | 101 | rand_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h |
| 119 | rand_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | 102 | rand_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h |
| 120 | rand_lib.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | ||
| 121 | rand_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h | 103 | rand_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h |
| 122 | rand_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h | 104 | rand_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h |
| 123 | rand_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 105 | rand_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h |
| 124 | rand_lib.o: ../../include/openssl/fips.h ../../include/openssl/fips_rand.h | ||
| 125 | rand_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 106 | rand_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h |
| 126 | rand_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | 107 | rand_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 127 | rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 108 | rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 128 | rand_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h | 109 | rand_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h |
| 129 | rand_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | 110 | rand_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h |
| 130 | rand_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 111 | rand_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
| 131 | rand_lib.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
| 132 | rand_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h | 112 | rand_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h |
| 133 | rand_lib.o: ../cryptlib.h rand_lcl.h rand_lib.c | 113 | rand_lib.o: ../cryptlib.h rand_lib.c |
| 134 | rand_nw.o: ../../e_os.h ../../include/openssl/asn1.h | 114 | rand_nw.o: ../../e_os.h ../../include/openssl/asn1.h |
| 135 | rand_nw.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | 115 | rand_nw.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h |
| 136 | rand_nw.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 116 | rand_nw.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h |
| 137 | rand_nw.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 117 | rand_nw.o: ../../include/openssl/err.h ../../include/openssl/evp.h |
| 138 | rand_nw.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h | 118 | rand_nw.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h |
| 139 | rand_nw.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | 119 | rand_nw.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 140 | rand_nw.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 120 | rand_nw.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 141 | rand_nw.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h | 121 | rand_nw.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h |
| 142 | rand_nw.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | 122 | rand_nw.o: ../../include/openssl/sha.h ../../include/openssl/stack.h |
| 143 | rand_nw.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 123 | rand_nw.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h rand_nw.c |
| 144 | rand_nw.o: ../cryptlib.h rand_lcl.h rand_nw.c | ||
| 145 | rand_os2.o: ../../e_os.h ../../include/openssl/asn1.h | 124 | rand_os2.o: ../../e_os.h ../../include/openssl/asn1.h |
| 146 | rand_os2.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | 125 | rand_os2.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h |
| 147 | rand_os2.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 126 | rand_os2.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h |
| 148 | rand_os2.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 127 | rand_os2.o: ../../include/openssl/err.h ../../include/openssl/evp.h |
| 149 | rand_os2.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h | 128 | rand_os2.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h |
| 150 | rand_os2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | 129 | rand_os2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 151 | rand_os2.o: ../../include/openssl/opensslconf.h | ||
| 152 | rand_os2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 130 | rand_os2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 153 | rand_os2.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h | 131 | rand_os2.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h |
| 154 | rand_os2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | 132 | rand_os2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h |
| @@ -158,8 +136,8 @@ rand_unix.o: ../../e_os.h ../../include/openssl/asn1.h | |||
| 158 | rand_unix.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | 136 | rand_unix.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h |
| 159 | rand_unix.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 137 | rand_unix.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h |
| 160 | rand_unix.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 138 | rand_unix.o: ../../include/openssl/err.h ../../include/openssl/evp.h |
| 161 | rand_unix.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h | 139 | rand_unix.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h |
| 162 | rand_unix.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | 140 | rand_unix.o: ../../include/openssl/objects.h |
| 163 | rand_unix.o: ../../include/openssl/opensslconf.h | 141 | rand_unix.o: ../../include/openssl/opensslconf.h |
| 164 | rand_unix.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 142 | rand_unix.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 165 | rand_unix.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h | 143 | rand_unix.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h |
| @@ -170,9 +148,8 @@ rand_win.o: ../../e_os.h ../../include/openssl/asn1.h | |||
| 170 | rand_win.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | 148 | rand_win.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h |
| 171 | rand_win.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 149 | rand_win.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h |
| 172 | rand_win.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 150 | rand_win.o: ../../include/openssl/err.h ../../include/openssl/evp.h |
| 173 | rand_win.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h | 151 | rand_win.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h |
| 174 | rand_win.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | 152 | rand_win.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 175 | rand_win.o: ../../include/openssl/opensslconf.h | ||
| 176 | rand_win.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 153 | rand_win.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 177 | rand_win.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h | 154 | rand_win.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h |
| 178 | rand_win.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | 155 | rand_win.o: ../../include/openssl/sha.h ../../include/openssl/stack.h |
diff --git a/src/lib/libcrypto/rand/Makefile.ssl b/src/lib/libcrypto/rand/Makefile.ssl new file mode 100644 index 0000000000..e5cbe5319c --- /dev/null +++ b/src/lib/libcrypto/rand/Makefile.ssl | |||
| @@ -0,0 +1,196 @@ | |||
| 1 | # | ||
| 2 | # SSLeay/crypto/rand/Makefile | ||
| 3 | # | ||
| 4 | |||
| 5 | DIR= rand | ||
| 6 | TOP= ../.. | ||
| 7 | CC= cc | ||
| 8 | INCLUDES= | ||
| 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= randtest.c | ||
| 23 | APPS= | ||
| 24 | |||
| 25 | LIB=$(TOP)/libcrypto.a | ||
| 26 | LIBSRC=md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \ | ||
| 27 | rand_win.c rand_unix.c rand_os2.c | ||
| 28 | LIBOBJ=md_rand.o randfile.o rand_lib.o rand_err.o rand_egd.o \ | ||
| 29 | rand_win.o rand_unix.o rand_os2.o | ||
| 30 | |||
| 31 | SRC= $(LIBSRC) | ||
| 32 | |||
| 33 | EXHEADER= rand.h | ||
| 34 | HEADER= $(EXHEADER) | ||
| 35 | |||
| 36 | ALL= $(GENERAL) $(SRC) $(HEADER) | ||
| 37 | |||
| 38 | top: | ||
| 39 | (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all) | ||
| 40 | |||
| 41 | all: lib | ||
| 42 | |||
| 43 | lib: $(LIBOBJ) | ||
| 44 | $(AR) $(LIB) $(LIBOBJ) | ||
| 45 | $(RANLIB) $(LIB) || echo Never mind. | ||
| 46 | @touch lib | ||
| 47 | |||
| 48 | files: | ||
| 49 | $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO | ||
| 50 | |||
| 51 | links: | ||
| 52 | @sh $(TOP)/util/point.sh Makefile.ssl Makefile | ||
| 53 | @$(PERL) $(TOP)/util/mklink.pl ../../include/openssl $(EXHEADER) | ||
| 54 | @$(PERL) $(TOP)/util/mklink.pl ../../test $(TEST) | ||
| 55 | @$(PERL) $(TOP)/util/mklink.pl ../../apps $(APPS) | ||
| 56 | |||
| 57 | install: | ||
| 58 | @for i in $(EXHEADER) ; \ | ||
| 59 | do \ | ||
| 60 | (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ | ||
| 61 | chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ | ||
| 62 | done; | ||
| 63 | |||
| 64 | tags: | ||
| 65 | ctags $(SRC) | ||
| 66 | |||
| 67 | tests: | ||
| 68 | |||
| 69 | lint: | ||
| 70 | lint -DLINT $(INCLUDES) $(SRC)>fluff | ||
| 71 | |||
| 72 | depend: | ||
| 73 | $(MAKEDEPEND) -- $(CFLAG) $(INCLUDES) $(DEPFLAG) -- $(PROGS) $(LIBSRC) | ||
| 74 | |||
| 75 | dclean: | ||
| 76 | $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new | ||
| 77 | mv -f Makefile.new $(MAKEFILE) | ||
| 78 | |||
| 79 | clean: | ||
| 80 | rm -f *.o *.obj lib tags core .pure .nfs* *.old *.bak fluff | ||
| 81 | |||
| 82 | # DO NOT DELETE THIS LINE -- make depend depends on it. | ||
| 83 | |||
| 84 | md_rand.o: ../../e_os.h ../../include/openssl/aes.h | ||
| 85 | md_rand.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | ||
| 86 | md_rand.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h | ||
| 87 | md_rand.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h | ||
| 88 | md_rand.o: ../../include/openssl/des.h ../../include/openssl/des_old.h | ||
| 89 | md_rand.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | ||
| 90 | md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
| 91 | md_rand.o: ../../include/openssl/evp.h ../../include/openssl/idea.h | ||
| 92 | md_rand.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h | ||
| 93 | md_rand.o: ../../include/openssl/md4.h ../../include/openssl/md5.h | ||
| 94 | md_rand.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h | ||
| 95 | md_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | ||
| 96 | md_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 97 | md_rand.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h | ||
| 98 | md_rand.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h | ||
| 99 | md_rand.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h | ||
| 100 | md_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 101 | md_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 102 | md_rand.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
| 103 | md_rand.o: md_rand.c rand_lcl.h | ||
| 104 | rand_egd.o: ../../include/openssl/buffer.h ../../include/openssl/e_os2.h | ||
| 105 | rand_egd.o: ../../include/openssl/opensslconf.h | ||
| 106 | rand_egd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h | ||
| 107 | rand_egd.o: rand_egd.c | ||
| 108 | rand_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h | ||
| 109 | rand_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | ||
| 110 | rand_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h | ||
| 111 | rand_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 112 | rand_err.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h | ||
| 113 | rand_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 114 | rand_err.o: rand_err.c | ||
| 115 | rand_lib.o: ../../e_os.h ../../include/openssl/asn1.h | ||
| 116 | rand_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h | ||
| 117 | rand_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h | ||
| 118 | rand_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h | ||
| 119 | rand_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h | ||
| 120 | rand_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h | ||
| 121 | rand_lib.o: ../../include/openssl/opensslconf.h | ||
| 122 | rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 123 | rand_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h | ||
| 124 | rand_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | ||
| 125 | rand_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | ||
| 126 | rand_lib.o: ../cryptlib.h rand_lib.c | ||
| 127 | rand_os2.o: ../../e_os.h ../../include/openssl/aes.h | ||
| 128 | rand_os2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | ||
| 129 | rand_os2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h | ||
| 130 | rand_os2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h | ||
| 131 | rand_os2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | ||
| 132 | rand_os2.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h | ||
| 133 | rand_os2.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h | ||
| 134 | rand_os2.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
| 135 | rand_os2.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h | ||
| 136 | rand_os2.o: ../../include/openssl/md2.h ../../include/openssl/md4.h | ||
| 137 | rand_os2.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h | ||
| 138 | rand_os2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | ||
| 139 | rand_os2.o: ../../include/openssl/opensslconf.h | ||
| 140 | rand_os2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 141 | rand_os2.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h | ||
| 142 | rand_os2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h | ||
| 143 | rand_os2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h | ||
| 144 | rand_os2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 145 | rand_os2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 146 | rand_os2.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
| 147 | rand_os2.o: ../cryptlib.h rand_lcl.h rand_os2.c | ||
| 148 | rand_unix.o: ../../e_os.h ../../include/openssl/aes.h | ||
| 149 | rand_unix.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | ||
| 150 | rand_unix.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h | ||
| 151 | rand_unix.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h | ||
| 152 | rand_unix.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | ||
| 153 | rand_unix.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h | ||
| 154 | rand_unix.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h | ||
| 155 | rand_unix.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
| 156 | rand_unix.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h | ||
| 157 | rand_unix.o: ../../include/openssl/md2.h ../../include/openssl/md4.h | ||
| 158 | rand_unix.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h | ||
| 159 | rand_unix.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | ||
| 160 | rand_unix.o: ../../include/openssl/opensslconf.h | ||
| 161 | rand_unix.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 162 | rand_unix.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h | ||
| 163 | rand_unix.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h | ||
| 164 | rand_unix.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h | ||
| 165 | rand_unix.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 166 | rand_unix.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 167 | rand_unix.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
| 168 | rand_unix.o: ../cryptlib.h rand_lcl.h rand_unix.c | ||
| 169 | rand_win.o: ../../e_os.h ../../include/openssl/aes.h | ||
| 170 | rand_win.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h | ||
| 171 | rand_win.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h | ||
| 172 | rand_win.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h | ||
| 173 | rand_win.o: ../../include/openssl/crypto.h ../../include/openssl/des.h | ||
| 174 | rand_win.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h | ||
| 175 | rand_win.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h | ||
| 176 | rand_win.o: ../../include/openssl/err.h ../../include/openssl/evp.h | ||
| 177 | rand_win.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h | ||
| 178 | rand_win.o: ../../include/openssl/md2.h ../../include/openssl/md4.h | ||
| 179 | rand_win.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h | ||
| 180 | rand_win.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | ||
| 181 | rand_win.o: ../../include/openssl/opensslconf.h | ||
| 182 | rand_win.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 183 | rand_win.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h | ||
| 184 | rand_win.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h | ||
| 185 | rand_win.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h | ||
| 186 | rand_win.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | ||
| 187 | rand_win.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 188 | rand_win.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
| 189 | rand_win.o: ../cryptlib.h rand_lcl.h rand_win.c | ||
| 190 | randfile.o: ../../e_os.h ../../include/openssl/buffer.h | ||
| 191 | randfile.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | ||
| 192 | randfile.o: ../../include/openssl/opensslconf.h | ||
| 193 | randfile.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | ||
| 194 | randfile.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h | ||
| 195 | randfile.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | ||
| 196 | randfile.o: randfile.c | ||
diff --git a/src/lib/libcrypto/rand/md_rand.c b/src/lib/libcrypto/rand/md_rand.c index 0f8dd3e00f..9783d0c23e 100644 --- a/src/lib/libcrypto/rand/md_rand.c +++ b/src/lib/libcrypto/rand/md_rand.c | |||
| @@ -126,10 +126,6 @@ | |||
| 126 | 126 | ||
| 127 | #include <openssl/crypto.h> | 127 | #include <openssl/crypto.h> |
| 128 | #include <openssl/err.h> | 128 | #include <openssl/err.h> |
| 129 | #ifdef OPENSSL_FIPS | ||
| 130 | #include <openssl/fips.h> | ||
| 131 | #endif | ||
| 132 | |||
| 133 | 129 | ||
| 134 | #ifdef BN_DEBUG | 130 | #ifdef BN_DEBUG |
| 135 | # define PREDICT | 131 | # define PREDICT |
| @@ -336,14 +332,6 @@ static int ssleay_rand_bytes(unsigned char *buf, int num) | |||
| 336 | #endif | 332 | #endif |
| 337 | int do_stir_pool = 0; | 333 | int do_stir_pool = 0; |
| 338 | 334 | ||
| 339 | #ifdef OPENSSL_FIPS | ||
| 340 | if(FIPS_mode()) | ||
| 341 | { | ||
| 342 | FIPSerr(FIPS_F_SSLEAY_RAND_BYTES,FIPS_R_NON_FIPS_METHOD); | ||
| 343 | return 0; | ||
| 344 | } | ||
| 345 | #endif | ||
| 346 | |||
| 347 | #ifdef PREDICT | 335 | #ifdef PREDICT |
| 348 | if (rand_predictable) | 336 | if (rand_predictable) |
| 349 | { | 337 | { |
diff --git a/src/lib/libcrypto/rand/rand.h b/src/lib/libcrypto/rand/rand.h new file mode 100644 index 0000000000..ac6c021763 --- /dev/null +++ b/src/lib/libcrypto/rand/rand.h | |||
| @@ -0,0 +1,140 @@ | |||
| 1 | /* crypto/rand/rand.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_RAND_H | ||
| 60 | #define HEADER_RAND_H | ||
| 61 | |||
| 62 | #include <stdlib.h> | ||
| 63 | #include <openssl/ossl_typ.h> | ||
| 64 | #include <openssl/e_os2.h> | ||
| 65 | |||
| 66 | #if defined(OPENSSL_SYS_WINDOWS) | ||
| 67 | #include <windows.h> | ||
| 68 | #endif | ||
| 69 | |||
| 70 | #ifdef __cplusplus | ||
| 71 | extern "C" { | ||
| 72 | #endif | ||
| 73 | |||
| 74 | #if defined(OPENSSL_FIPS) | ||
| 75 | #define FIPS_RAND_SIZE_T size_t | ||
| 76 | #endif | ||
| 77 | |||
| 78 | /* Already defined in ossl_typ.h */ | ||
| 79 | /* typedef struct rand_meth_st RAND_METHOD; */ | ||
| 80 | |||
| 81 | struct rand_meth_st | ||
| 82 | { | ||
| 83 | void (*seed)(const void *buf, int num); | ||
| 84 | int (*bytes)(unsigned char *buf, int num); | ||
| 85 | void (*cleanup)(void); | ||
| 86 | void (*add)(const void *buf, int num, double entropy); | ||
| 87 | int (*pseudorand)(unsigned char *buf, int num); | ||
| 88 | int (*status)(void); | ||
| 89 | }; | ||
| 90 | |||
| 91 | #ifdef BN_DEBUG | ||
| 92 | extern int rand_predictable; | ||
| 93 | #endif | ||
| 94 | |||
| 95 | int RAND_set_rand_method(const RAND_METHOD *meth); | ||
| 96 | const RAND_METHOD *RAND_get_rand_method(void); | ||
| 97 | #ifndef OPENSSL_NO_ENGINE | ||
| 98 | int RAND_set_rand_engine(ENGINE *engine); | ||
| 99 | #endif | ||
| 100 | RAND_METHOD *RAND_SSLeay(void); | ||
| 101 | void RAND_cleanup(void ); | ||
| 102 | int RAND_bytes(unsigned char *buf,int num); | ||
| 103 | int RAND_pseudo_bytes(unsigned char *buf,int num); | ||
| 104 | void RAND_seed(const void *buf,int num); | ||
| 105 | void RAND_add(const void *buf,int num,double entropy); | ||
| 106 | int RAND_load_file(const char *file,long max_bytes); | ||
| 107 | int RAND_write_file(const char *file); | ||
| 108 | const char *RAND_file_name(char *file,size_t num); | ||
| 109 | int RAND_status(void); | ||
| 110 | int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes); | ||
| 111 | int RAND_egd(const char *path); | ||
| 112 | int RAND_egd_bytes(const char *path,int bytes); | ||
| 113 | int RAND_poll(void); | ||
| 114 | |||
| 115 | #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) | ||
| 116 | |||
| 117 | void RAND_screen(void); | ||
| 118 | int RAND_event(UINT, WPARAM, LPARAM); | ||
| 119 | |||
| 120 | #endif | ||
| 121 | |||
| 122 | /* BEGIN ERROR CODES */ | ||
| 123 | /* The following lines are auto generated by the script mkerr.pl. Any changes | ||
| 124 | * made after this point may be overwritten when the script is next run. | ||
| 125 | */ | ||
| 126 | void ERR_load_RAND_strings(void); | ||
| 127 | |||
| 128 | /* Error codes for the RAND functions. */ | ||
| 129 | |||
| 130 | /* Function codes. */ | ||
| 131 | #define RAND_F_RAND_GET_RAND_METHOD 101 | ||
| 132 | #define RAND_F_SSLEAY_RAND_BYTES 100 | ||
| 133 | |||
| 134 | /* Reason codes. */ | ||
| 135 | #define RAND_R_PRNG_NOT_SEEDED 100 | ||
| 136 | |||
| 137 | #ifdef __cplusplus | ||
| 138 | } | ||
| 139 | #endif | ||
| 140 | #endif | ||
diff --git a/src/lib/libcrypto/rand/rand_err.c b/src/lib/libcrypto/rand/rand_err.c new file mode 100644 index 0000000000..386934dcd1 --- /dev/null +++ b/src/lib/libcrypto/rand/rand_err.c | |||
| @@ -0,0 +1,96 @@ | |||
| 1 | /* crypto/rand/rand_err.c */ | ||
| 2 | /* ==================================================================== | ||
| 3 | * Copyright (c) 1999-2005 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/rand.h> | ||
| 64 | |||
| 65 | /* BEGIN ERROR CODES */ | ||
| 66 | #ifndef OPENSSL_NO_ERR | ||
| 67 | |||
| 68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_RAND,func,0) | ||
| 69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_RAND,0,reason) | ||
| 70 | |||
| 71 | static ERR_STRING_DATA RAND_str_functs[]= | ||
| 72 | { | ||
| 73 | {ERR_FUNC(RAND_F_RAND_GET_RAND_METHOD), "RAND_get_rand_method"}, | ||
| 74 | {ERR_FUNC(RAND_F_SSLEAY_RAND_BYTES), "SSLEAY_RAND_BYTES"}, | ||
| 75 | {0,NULL} | ||
| 76 | }; | ||
| 77 | |||
| 78 | static ERR_STRING_DATA RAND_str_reasons[]= | ||
| 79 | { | ||
| 80 | {ERR_REASON(RAND_R_PRNG_NOT_SEEDED) ,"PRNG not seeded"}, | ||
| 81 | {0,NULL} | ||
| 82 | }; | ||
| 83 | |||
| 84 | #endif | ||
| 85 | |||
| 86 | void ERR_load_RAND_strings(void) | ||
| 87 | { | ||
| 88 | #ifndef OPENSSL_NO_ERR | ||
| 89 | |||
| 90 | if (ERR_func_error_string(RAND_str_functs[0].error) == NULL) | ||
| 91 | { | ||
| 92 | ERR_load_strings(0,RAND_str_functs); | ||
| 93 | ERR_load_strings(0,RAND_str_reasons); | ||
| 94 | } | ||
| 95 | #endif | ||
| 96 | } | ||
diff --git a/src/lib/libcrypto/rand/rand_lcl.h b/src/lib/libcrypto/rand/rand_lcl.h index 18cc9b1e4a..618a8ec899 100644 --- a/src/lib/libcrypto/rand/rand_lcl.h +++ b/src/lib/libcrypto/rand/rand_lcl.h | |||
| @@ -154,16 +154,5 @@ | |||
| 154 | #define MD(a,b,c) EVP_Digest(a,b,c,NULL,EVP_md2(), NULL) | 154 | #define MD(a,b,c) EVP_Digest(a,b,c,NULL,EVP_md2(), NULL) |
| 155 | #endif | 155 | #endif |
| 156 | 156 | ||
| 157 | #ifndef OPENSSL_NO_ENGINE | ||
| 158 | void int_RAND_set_callbacks( | ||
| 159 | int (*set_rand_func)(const RAND_METHOD *meth, | ||
| 160 | const RAND_METHOD **pmeth), | ||
| 161 | const RAND_METHOD *(*get_rand_func) | ||
| 162 | (const RAND_METHOD **pmeth)); | ||
| 163 | int eng_RAND_set_rand_method(const RAND_METHOD *meth, | ||
| 164 | const RAND_METHOD **pmeth); | ||
| 165 | const RAND_METHOD *eng_RAND_get_rand_method(const RAND_METHOD **pmeth); | ||
| 166 | #endif | ||
| 167 | |||
| 168 | 157 | ||
| 169 | #endif | 158 | #endif |
diff --git a/src/lib/libcrypto/rand/rand_lib.c b/src/lib/libcrypto/rand/rand_lib.c new file mode 100644 index 0000000000..513e338985 --- /dev/null +++ b/src/lib/libcrypto/rand/rand_lib.c | |||
| @@ -0,0 +1,176 @@ | |||
| 1 | /* crypto/rand/rand_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 <time.h> | ||
| 61 | #include "cryptlib.h" | ||
| 62 | #include <openssl/rand.h> | ||
| 63 | #ifndef OPENSSL_NO_ENGINE | ||
| 64 | #include <openssl/engine.h> | ||
| 65 | #endif | ||
| 66 | |||
| 67 | #ifndef OPENSSL_NO_ENGINE | ||
| 68 | /* non-NULL if default_RAND_meth is ENGINE-provided */ | ||
| 69 | static ENGINE *funct_ref =NULL; | ||
| 70 | #endif | ||
| 71 | static const RAND_METHOD *default_RAND_meth = NULL; | ||
| 72 | |||
| 73 | int RAND_set_rand_method(const RAND_METHOD *meth) | ||
| 74 | { | ||
| 75 | #ifndef OPENSSL_NO_ENGINE | ||
| 76 | if(funct_ref) | ||
| 77 | { | ||
| 78 | ENGINE_finish(funct_ref); | ||
| 79 | funct_ref = NULL; | ||
| 80 | } | ||
| 81 | #endif | ||
| 82 | default_RAND_meth = meth; | ||
| 83 | return 1; | ||
| 84 | } | ||
| 85 | |||
| 86 | const RAND_METHOD *RAND_get_rand_method(void) | ||
| 87 | { | ||
| 88 | if (!default_RAND_meth) | ||
| 89 | { | ||
| 90 | #ifndef OPENSSL_NO_ENGINE | ||
| 91 | ENGINE *e = ENGINE_get_default_RAND(); | ||
| 92 | if(e) | ||
| 93 | { | ||
| 94 | default_RAND_meth = ENGINE_get_RAND(e); | ||
| 95 | if(!default_RAND_meth) | ||
| 96 | { | ||
| 97 | ENGINE_finish(e); | ||
| 98 | e = NULL; | ||
| 99 | } | ||
| 100 | } | ||
| 101 | if(e) | ||
| 102 | funct_ref = e; | ||
| 103 | else | ||
| 104 | #endif | ||
| 105 | default_RAND_meth = RAND_SSLeay(); | ||
| 106 | } | ||
| 107 | return default_RAND_meth; | ||
| 108 | } | ||
| 109 | |||
| 110 | #ifndef OPENSSL_NO_ENGINE | ||
| 111 | int RAND_set_rand_engine(ENGINE *engine) | ||
| 112 | { | ||
| 113 | const RAND_METHOD *tmp_meth = NULL; | ||
| 114 | if(engine) | ||
| 115 | { | ||
| 116 | if(!ENGINE_init(engine)) | ||
| 117 | return 0; | ||
| 118 | tmp_meth = ENGINE_get_RAND(engine); | ||
| 119 | if(!tmp_meth) | ||
| 120 | { | ||
| 121 | ENGINE_finish(engine); | ||
| 122 | return 0; | ||
| 123 | } | ||
| 124 | } | ||
| 125 | /* This function releases any prior ENGINE so call it first */ | ||
| 126 | RAND_set_rand_method(tmp_meth); | ||
| 127 | funct_ref = engine; | ||
| 128 | return 1; | ||
| 129 | } | ||
| 130 | #endif | ||
| 131 | |||
| 132 | void RAND_cleanup(void) | ||
| 133 | { | ||
| 134 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 135 | if (meth && meth->cleanup) | ||
| 136 | meth->cleanup(); | ||
| 137 | RAND_set_rand_method(NULL); | ||
| 138 | } | ||
| 139 | |||
| 140 | void RAND_seed(const void *buf, int num) | ||
| 141 | { | ||
| 142 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 143 | if (meth && meth->seed) | ||
| 144 | meth->seed(buf,num); | ||
| 145 | } | ||
| 146 | |||
| 147 | void RAND_add(const void *buf, int num, double entropy) | ||
| 148 | { | ||
| 149 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 150 | if (meth && meth->add) | ||
| 151 | meth->add(buf,num,entropy); | ||
| 152 | } | ||
| 153 | |||
| 154 | int RAND_bytes(unsigned char *buf, int num) | ||
| 155 | { | ||
| 156 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 157 | if (meth && meth->bytes) | ||
| 158 | return meth->bytes(buf,num); | ||
| 159 | return(-1); | ||
| 160 | } | ||
| 161 | |||
| 162 | int RAND_pseudo_bytes(unsigned char *buf, int num) | ||
| 163 | { | ||
| 164 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 165 | if (meth && meth->pseudorand) | ||
| 166 | return meth->pseudorand(buf,num); | ||
| 167 | return(-1); | ||
| 168 | } | ||
| 169 | |||
| 170 | int RAND_status(void) | ||
| 171 | { | ||
| 172 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 173 | if (meth && meth->status) | ||
| 174 | return meth->status(); | ||
| 175 | return 0; | ||
| 176 | } | ||
diff --git a/src/lib/libcrypto/rand/rand_nw.c b/src/lib/libcrypto/rand/rand_nw.c new file mode 100644 index 0000000000..f177ffbe82 --- /dev/null +++ b/src/lib/libcrypto/rand/rand_nw.c | |||
| @@ -0,0 +1,183 @@ | |||
| 1 | /* crypto/rand/rand_nw.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 | * Copyright (c) 1998-2000 The OpenSSL Project. All rights reserved. | ||
| 60 | * | ||
| 61 | * Redistribution and use in source and binary forms, with or without | ||
| 62 | * modification, are permitted provided that the following conditions | ||
| 63 | * are met: | ||
| 64 | * | ||
| 65 | * 1. Redistributions of source code must retain the above copyright | ||
| 66 | * notice, this list of conditions and the following disclaimer. | ||
| 67 | * | ||
| 68 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 69 | * notice, this list of conditions and the following disclaimer in | ||
| 70 | * the documentation and/or other materials provided with the | ||
| 71 | * distribution. | ||
| 72 | * | ||
| 73 | * 3. All advertising materials mentioning features or use of this | ||
| 74 | * software must display the following acknowledgment: | ||
| 75 | * "This product includes software developed by the OpenSSL Project | ||
| 76 | * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
| 77 | * | ||
| 78 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 79 | * endorse or promote products derived from this software without | ||
| 80 | * prior written permission. For written permission, please contact | ||
| 81 | * openssl-core@openssl.org. | ||
| 82 | * | ||
| 83 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 84 | * nor may "OpenSSL" appear in their names without prior written | ||
| 85 | * permission of the OpenSSL Project. | ||
| 86 | * | ||
| 87 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 88 | * acknowledgment: | ||
| 89 | * "This product includes software developed by the OpenSSL Project | ||
| 90 | * for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
| 91 | * | ||
| 92 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 93 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 94 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 95 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 96 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 97 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 98 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 99 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 100 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 101 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 102 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 103 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 104 | * ==================================================================== | ||
| 105 | * | ||
| 106 | * This product includes cryptographic software written by Eric Young | ||
| 107 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 108 | * Hudson (tjh@cryptsoft.com). | ||
| 109 | * | ||
| 110 | */ | ||
| 111 | |||
| 112 | #include "cryptlib.h" | ||
| 113 | #include <openssl/rand.h> | ||
| 114 | #include "rand_lcl.h" | ||
| 115 | |||
| 116 | #if defined (OPENSSL_SYS_NETWARE) | ||
| 117 | |||
| 118 | #if defined(NETWARE_LIBC) | ||
| 119 | #include <nks/thread.h> | ||
| 120 | #else | ||
| 121 | #include <nwthread.h> | ||
| 122 | #endif | ||
| 123 | |||
| 124 | extern int GetProcessSwitchCount(void); | ||
| 125 | #if !defined(NETWARE_LIBC) || (CURRENT_NDK_THRESHOLD < 509220000) | ||
| 126 | extern void *RunningProcess; /* declare here same as found in newer NDKs */ | ||
| 127 | extern unsigned long GetSuperHighResolutionTimer(void); | ||
| 128 | #endif | ||
| 129 | |||
| 130 | /* the FAQ indicates we need to provide at least 20 bytes (160 bits) of seed | ||
| 131 | */ | ||
| 132 | int RAND_poll(void) | ||
| 133 | { | ||
| 134 | unsigned long l; | ||
| 135 | unsigned long tsc; | ||
| 136 | int i; | ||
| 137 | |||
| 138 | /* There are several options to gather miscellaneous data | ||
| 139 | * but for now we will loop checking the time stamp counter (rdtsc) and | ||
| 140 | * the SuperHighResolutionTimer. Each iteration will collect 8 bytes | ||
| 141 | * of data but it is treated as only 1 byte of entropy. The call to | ||
| 142 | * ThreadSwitchWithDelay() will introduce additional variability into | ||
| 143 | * the data returned by rdtsc. | ||
| 144 | * | ||
| 145 | * Applications can agument the seed material by adding additional | ||
| 146 | * stuff with RAND_add() and should probably do so. | ||
| 147 | */ | ||
| 148 | l = GetProcessSwitchCount(); | ||
| 149 | RAND_add(&l,sizeof(l),1); | ||
| 150 | |||
| 151 | /* need to cast the void* to unsigned long here */ | ||
| 152 | l = (unsigned long)RunningProcess; | ||
| 153 | RAND_add(&l,sizeof(l),1); | ||
| 154 | |||
| 155 | for( i=2; i<ENTROPY_NEEDED; i++) | ||
| 156 | { | ||
| 157 | #ifdef __MWERKS__ | ||
| 158 | asm | ||
| 159 | { | ||
| 160 | rdtsc | ||
| 161 | mov tsc, eax | ||
| 162 | } | ||
| 163 | #else | ||
| 164 | asm volatile("rdtsc":"=A" (tsc)); | ||
| 165 | #endif | ||
| 166 | |||
| 167 | RAND_add(&tsc, sizeof(tsc), 1); | ||
| 168 | |||
| 169 | l = GetSuperHighResolutionTimer(); | ||
| 170 | RAND_add(&l, sizeof(l), 0); | ||
| 171 | |||
| 172 | # if defined(NETWARE_LIBC) | ||
| 173 | NXThreadYield(); | ||
| 174 | # else /* NETWARE_CLIB */ | ||
| 175 | ThreadSwitchWithDelay(); | ||
| 176 | # endif | ||
| 177 | } | ||
| 178 | |||
| 179 | return 1; | ||
| 180 | } | ||
| 181 | |||
| 182 | #endif | ||
| 183 | |||
diff --git a/src/lib/libcrypto/rand/rand_unix.c b/src/lib/libcrypto/rand/rand_unix.c index 6c2be5cb96..964d25833c 100644 --- a/src/lib/libcrypto/rand/rand_unix.c +++ b/src/lib/libcrypto/rand/rand_unix.c | |||
| @@ -136,16 +136,10 @@ | |||
| 136 | #ifdef __OpenBSD__ | 136 | #ifdef __OpenBSD__ |
| 137 | int RAND_poll(void) | 137 | int RAND_poll(void) |
| 138 | { | 138 | { |
| 139 | u_int32_t rnd = 0, i; | ||
| 140 | unsigned char buf[ENTROPY_NEEDED]; | 139 | unsigned char buf[ENTROPY_NEEDED]; |
| 141 | 140 | ||
| 142 | for (i = 0; i < sizeof(buf); i++) { | 141 | arc4random_buf(buf, sizeof(buf)); |
| 143 | if (i % 4 == 0) | 142 | RAND_add(buf, sizeof(buf), sizeof(buf)); |
| 144 | rnd = arc4random(); | ||
| 145 | buf[i] = rnd; | ||
| 146 | rnd >>= 8; | ||
| 147 | } | ||
| 148 | RAND_add(buf, sizeof(buf), ENTROPY_NEEDED); | ||
| 149 | memset(buf, 0, sizeof(buf)); | 143 | memset(buf, 0, sizeof(buf)); |
| 150 | 144 | ||
| 151 | return 1; | 145 | return 1; |
diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c new file mode 100644 index 0000000000..005cb38cb0 --- /dev/null +++ b/src/lib/libcrypto/rand/randfile.c | |||
| @@ -0,0 +1,287 @@ | |||
| 1 | /* crypto/rand/randfile.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 | /* We need to define this to get macros like S_IFBLK and S_IFCHR */ | ||
| 60 | #define _XOPEN_SOURCE 500 | ||
| 61 | |||
| 62 | #include <errno.h> | ||
| 63 | #include <stdio.h> | ||
| 64 | #include <stdlib.h> | ||
| 65 | #include <string.h> | ||
| 66 | |||
| 67 | #include "e_os.h" | ||
| 68 | #include <openssl/crypto.h> | ||
| 69 | #include <openssl/rand.h> | ||
| 70 | #include <openssl/buffer.h> | ||
| 71 | |||
| 72 | #ifdef OPENSSL_SYS_VMS | ||
| 73 | #include <unixio.h> | ||
| 74 | #endif | ||
| 75 | #ifndef NO_SYS_TYPES_H | ||
| 76 | # include <sys/types.h> | ||
| 77 | #endif | ||
| 78 | #ifdef MAC_OS_pre_X | ||
| 79 | # include <stat.h> | ||
| 80 | #else | ||
| 81 | # include <sys/stat.h> | ||
| 82 | #endif | ||
| 83 | |||
| 84 | #undef BUFSIZE | ||
| 85 | #define BUFSIZE 1024 | ||
| 86 | #define RAND_DATA 1024 | ||
| 87 | |||
| 88 | /* #define RFILE ".rnd" - defined in ../../e_os.h */ | ||
| 89 | |||
| 90 | /* Note that these functions are intended for seed files only. | ||
| 91 | * Entropy devices and EGD sockets are handled in rand_unix.c */ | ||
| 92 | |||
| 93 | int RAND_load_file(const char *file, long bytes) | ||
| 94 | { | ||
| 95 | /* If bytes >= 0, read up to 'bytes' bytes. | ||
| 96 | * if bytes == -1, read complete file. */ | ||
| 97 | |||
| 98 | MS_STATIC unsigned char buf[BUFSIZE]; | ||
| 99 | struct stat sb; | ||
| 100 | int i,ret=0,n; | ||
| 101 | FILE *in; | ||
| 102 | |||
| 103 | if (file == NULL) return(0); | ||
| 104 | |||
| 105 | if (stat(file,&sb) < 0) return(0); | ||
| 106 | RAND_add(&sb,sizeof(sb),0.0); | ||
| 107 | if (bytes == 0) return(ret); | ||
| 108 | |||
| 109 | in=fopen(file,"rb"); | ||
| 110 | if (in == NULL) goto err; | ||
| 111 | #if defined(S_IFBLK) && defined(S_IFCHR) | ||
| 112 | if (sb.st_mode & (S_IFBLK | S_IFCHR)) { | ||
| 113 | /* this file is a device. we don't want read an infinite number | ||
| 114 | * of bytes from a random device, nor do we want to use buffered | ||
| 115 | * I/O because we will waste system entropy. | ||
| 116 | */ | ||
| 117 | bytes = (bytes == -1) ? 2048 : bytes; /* ok, is 2048 enough? */ | ||
| 118 | setvbuf(in, NULL, _IONBF, 0); /* don't do buffered reads */ | ||
| 119 | } | ||
| 120 | #endif | ||
| 121 | for (;;) | ||
| 122 | { | ||
| 123 | if (bytes > 0) | ||
| 124 | n = (bytes < BUFSIZE)?(int)bytes:BUFSIZE; | ||
| 125 | else | ||
| 126 | n = BUFSIZE; | ||
| 127 | i=fread(buf,1,n,in); | ||
| 128 | if (i <= 0) break; | ||
| 129 | #ifdef PURIFY | ||
| 130 | RAND_add(buf,i,(double)i); | ||
| 131 | #else | ||
| 132 | /* even if n != i, use the full array */ | ||
| 133 | RAND_add(buf,n,(double)i); | ||
| 134 | #endif | ||
| 135 | ret+=i; | ||
| 136 | if (bytes > 0) | ||
| 137 | { | ||
| 138 | bytes-=n; | ||
| 139 | if (bytes <= 0) break; | ||
| 140 | } | ||
| 141 | } | ||
| 142 | fclose(in); | ||
| 143 | OPENSSL_cleanse(buf,BUFSIZE); | ||
| 144 | err: | ||
| 145 | return(ret); | ||
| 146 | } | ||
| 147 | |||
| 148 | int RAND_write_file(const char *file) | ||
| 149 | { | ||
| 150 | unsigned char buf[BUFSIZE]; | ||
| 151 | int i,ret=0,rand_err=0; | ||
| 152 | FILE *out = NULL; | ||
| 153 | int n; | ||
| 154 | struct stat sb; | ||
| 155 | |||
| 156 | i=stat(file,&sb); | ||
| 157 | if (i != -1) { | ||
| 158 | #if defined(S_IFBLK) && defined(S_IFCHR) | ||
| 159 | if (sb.st_mode & (S_IFBLK | S_IFCHR)) { | ||
| 160 | /* this file is a device. we don't write back to it. | ||
| 161 | * we "succeed" on the assumption this is some sort | ||
| 162 | * of random device. Otherwise attempting to write to | ||
| 163 | * and chmod the device causes problems. | ||
| 164 | */ | ||
| 165 | return(1); | ||
| 166 | } | ||
| 167 | #endif | ||
| 168 | } | ||
| 169 | |||
| 170 | #if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32) | ||
| 171 | { | ||
| 172 | /* For some reason Win32 can't write to files created this way */ | ||
| 173 | |||
| 174 | /* chmod(..., 0600) is too late to protect the file, | ||
| 175 | * permissions should be restrictive from the start */ | ||
| 176 | int fd = open(file, O_CREAT, 0600); | ||
| 177 | if (fd != -1) | ||
| 178 | out = fdopen(fd, "wb"); | ||
| 179 | } | ||
| 180 | #endif | ||
| 181 | if (out == NULL) | ||
| 182 | out = fopen(file,"wb"); | ||
| 183 | if (out == NULL) goto err; | ||
| 184 | |||
| 185 | #ifndef NO_CHMOD | ||
| 186 | chmod(file,0600); | ||
| 187 | #endif | ||
| 188 | n=RAND_DATA; | ||
| 189 | for (;;) | ||
| 190 | { | ||
| 191 | i=(n > BUFSIZE)?BUFSIZE:n; | ||
| 192 | n-=BUFSIZE; | ||
| 193 | if (RAND_bytes(buf,i) <= 0) | ||
| 194 | rand_err=1; | ||
| 195 | i=fwrite(buf,1,i,out); | ||
| 196 | if (i <= 0) | ||
| 197 | { | ||
| 198 | ret=0; | ||
| 199 | break; | ||
| 200 | } | ||
| 201 | ret+=i; | ||
| 202 | if (n <= 0) break; | ||
| 203 | } | ||
| 204 | #ifdef OPENSSL_SYS_VMS | ||
| 205 | /* Try to delete older versions of the file, until there aren't | ||
| 206 | any */ | ||
| 207 | { | ||
| 208 | char *tmpf; | ||
| 209 | |||
| 210 | tmpf = OPENSSL_malloc(strlen(file) + 4); /* to add ";-1" and a nul */ | ||
| 211 | if (tmpf) | ||
| 212 | { | ||
| 213 | strcpy(tmpf, file); | ||
| 214 | strcat(tmpf, ";-1"); | ||
| 215 | while(delete(tmpf) == 0) | ||
| 216 | ; | ||
| 217 | rename(file,";1"); /* Make sure it's version 1, or we | ||
| 218 | will reach the limit (32767) at | ||
| 219 | some point... */ | ||
| 220 | } | ||
| 221 | } | ||
| 222 | #endif /* OPENSSL_SYS_VMS */ | ||
| 223 | |||
| 224 | fclose(out); | ||
| 225 | OPENSSL_cleanse(buf,BUFSIZE); | ||
| 226 | err: | ||
| 227 | return (rand_err ? -1 : ret); | ||
| 228 | } | ||
| 229 | |||
| 230 | const char *RAND_file_name(char *buf, size_t size) | ||
| 231 | { | ||
| 232 | char *s=NULL; | ||
| 233 | int ok = 0; | ||
| 234 | #ifdef __OpenBSD__ | ||
| 235 | struct stat sb; | ||
| 236 | #endif | ||
| 237 | |||
| 238 | if (issetugid() == 0) | ||
| 239 | s=getenv("RANDFILE"); | ||
| 240 | if (s != NULL && *s && strlen(s) + 1 < size) | ||
| 241 | { | ||
| 242 | if (BUF_strlcpy(buf,s,size) >= size) | ||
| 243 | return NULL; | ||
| 244 | } | ||
| 245 | else | ||
| 246 | { | ||
| 247 | if (issetugid() == 0) | ||
| 248 | s=getenv("HOME"); | ||
| 249 | #ifdef DEFAULT_HOME | ||
| 250 | if (s == NULL) | ||
| 251 | { | ||
| 252 | s = DEFAULT_HOME; | ||
| 253 | } | ||
| 254 | #endif | ||
| 255 | if (s && *s && strlen(s)+strlen(RFILE)+2 < size) | ||
| 256 | { | ||
| 257 | BUF_strlcpy(buf,s,size); | ||
| 258 | #ifndef OPENSSL_SYS_VMS | ||
| 259 | BUF_strlcat(buf,"/",size); | ||
| 260 | #endif | ||
| 261 | BUF_strlcat(buf,RFILE,size); | ||
| 262 | ok = 1; | ||
| 263 | } | ||
| 264 | else | ||
| 265 | buf[0] = '\0'; /* no file name */ | ||
| 266 | } | ||
| 267 | |||
| 268 | #ifdef __OpenBSD__ | ||
| 269 | /* given that all random loads just fail if the file can't be | ||
| 270 | * seen on a stat, we stat the file we're returning, if it | ||
| 271 | * fails, use /dev/arandom instead. this allows the user to | ||
| 272 | * use their own source for good random data, but defaults | ||
| 273 | * to something hopefully decent if that isn't available. | ||
| 274 | */ | ||
| 275 | |||
| 276 | if (!ok) | ||
| 277 | if (BUF_strlcpy(buf,"/dev/arandom",size) >= size) { | ||
| 278 | return(NULL); | ||
| 279 | } | ||
| 280 | if (stat(buf,&sb) == -1) | ||
| 281 | if (BUF_strlcpy(buf,"/dev/arandom",size) >= size) { | ||
| 282 | return(NULL); | ||
| 283 | } | ||
| 284 | |||
| 285 | #endif | ||
| 286 | return(buf); | ||
| 287 | } | ||
