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 | 46 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand.h | 167 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_egd.c | 2 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_err.c | 114 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_lcl.h | 11 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_lib.c | 245 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_nw.c | 183 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_os2.c | 6 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_unix.c | 81 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/rand_win.c | 71 | ||||
| -rw-r--r-- | src/lib/libcrypto/rand/randfile.c | 313 |
13 files changed, 1315 insertions, 191 deletions
diff --git a/src/lib/libcrypto/rand/Makefile b/src/lib/libcrypto/rand/Makefile index 27694aa664..30794305cb 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_err.c rand_egd.c \ | 20 | LIBSRC=md_rand.c randfile.c rand_lib.c rand_eng.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_err.o rand_egd.o \ | 22 | LIBOBJ=md_rand.o randfile.o rand_lib.o rand_eng.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 | $(AR) $(LIB) $(LIBOBJ) | 38 | $(ARX) $(LIB) $(LIBOBJ) |
| 39 | $(RANLIB) $(LIB) || echo Never mind. | 39 | $(RANLIB) $(LIB) || echo Never mind. |
| 40 | @touch lib | 40 | @touch lib |
| 41 | 41 | ||
| @@ -79,17 +79,34 @@ 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/lhash.h | 82 | md_rand.o: ../../include/openssl/evp.h ../../include/openssl/fips.h |
| 83 | md_rand.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h | 83 | md_rand.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h |
| 84 | md_rand.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h | 84 | md_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 85 | md_rand.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h | 85 | md_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 86 | md_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | 86 | md_rand.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h |
| 87 | md_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 87 | md_rand.o: ../../include/openssl/sha.h ../../include/openssl/stack.h |
| 88 | md_rand.o: md_rand.c rand_lcl.h | 88 | md_rand.o: ../../include/openssl/symhacks.h 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 | ||
| 93 | rand_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h | 110 | rand_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h |
| 94 | rand_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h | 111 | rand_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h |
| 95 | rand_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h | 112 | rand_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h |
| @@ -99,34 +116,39 @@ rand_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | |||
| 99 | rand_err.o: rand_err.c | 116 | rand_err.o: rand_err.c |
| 100 | rand_lib.o: ../../e_os.h ../../include/openssl/asn1.h | 117 | rand_lib.o: ../../e_os.h ../../include/openssl/asn1.h |
| 101 | rand_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | 118 | rand_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h |
| 102 | rand_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 119 | rand_lib.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
| 120 | rand_lib.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h | ||
| 103 | rand_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h | 121 | rand_lib.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h |
| 104 | rand_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h | 122 | rand_lib.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h |
| 105 | rand_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 123 | rand_lib.o: ../../include/openssl/err.h ../../include/openssl/evp.h |
| 124 | rand_lib.o: ../../include/openssl/fips.h ../../include/openssl/fips_rand.h | ||
| 106 | rand_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 125 | rand_lib.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h |
| 107 | rand_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | 126 | rand_lib.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h |
| 108 | rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 127 | rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 109 | rand_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h | 128 | rand_lib.o: ../../include/openssl/pkcs7.h ../../include/openssl/rand.h |
| 110 | rand_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h | 129 | rand_lib.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h |
| 111 | rand_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 130 | rand_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
| 131 | rand_lib.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | ||
| 112 | rand_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h | 132 | rand_lib.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h |
| 113 | rand_lib.o: ../cryptlib.h rand_lib.c | 133 | rand_lib.o: ../cryptlib.h rand_lcl.h rand_lib.c |
| 114 | rand_nw.o: ../../e_os.h ../../include/openssl/asn1.h | 134 | rand_nw.o: ../../e_os.h ../../include/openssl/asn1.h |
| 115 | rand_nw.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | 135 | rand_nw.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h |
| 116 | rand_nw.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 136 | rand_nw.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h |
| 117 | rand_nw.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 137 | rand_nw.o: ../../include/openssl/err.h ../../include/openssl/evp.h |
| 118 | rand_nw.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 138 | rand_nw.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h |
| 119 | rand_nw.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | 139 | rand_nw.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h |
| 120 | rand_nw.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 140 | rand_nw.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h |
| 121 | rand_nw.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h | 141 | rand_nw.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h |
| 122 | rand_nw.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | 142 | rand_nw.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h |
| 123 | rand_nw.o: ../../include/openssl/symhacks.h ../cryptlib.h rand_lcl.h rand_nw.c | 143 | rand_nw.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h |
| 144 | rand_nw.o: ../cryptlib.h rand_lcl.h rand_nw.c | ||
| 124 | rand_os2.o: ../../e_os.h ../../include/openssl/asn1.h | 145 | rand_os2.o: ../../e_os.h ../../include/openssl/asn1.h |
| 125 | rand_os2.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | 146 | rand_os2.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h |
| 126 | rand_os2.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 147 | rand_os2.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h |
| 127 | rand_os2.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 148 | rand_os2.o: ../../include/openssl/err.h ../../include/openssl/evp.h |
| 128 | rand_os2.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 149 | rand_os2.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h |
| 129 | rand_os2.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | 150 | rand_os2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h |
| 151 | rand_os2.o: ../../include/openssl/opensslconf.h | ||
| 130 | rand_os2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 152 | rand_os2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 131 | rand_os2.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h | 153 | rand_os2.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h |
| 132 | rand_os2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | 154 | rand_os2.o: ../../include/openssl/sha.h ../../include/openssl/stack.h |
| @@ -136,8 +158,8 @@ rand_unix.o: ../../e_os.h ../../include/openssl/asn1.h | |||
| 136 | rand_unix.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | 158 | rand_unix.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h |
| 137 | rand_unix.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 159 | rand_unix.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h |
| 138 | rand_unix.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 160 | rand_unix.o: ../../include/openssl/err.h ../../include/openssl/evp.h |
| 139 | rand_unix.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 161 | rand_unix.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h |
| 140 | rand_unix.o: ../../include/openssl/objects.h | 162 | rand_unix.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h |
| 141 | rand_unix.o: ../../include/openssl/opensslconf.h | 163 | rand_unix.o: ../../include/openssl/opensslconf.h |
| 142 | rand_unix.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 164 | rand_unix.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 143 | rand_unix.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h | 165 | rand_unix.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h |
| @@ -148,8 +170,9 @@ rand_win.o: ../../e_os.h ../../include/openssl/asn1.h | |||
| 148 | rand_win.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h | 170 | rand_win.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h |
| 149 | rand_win.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h | 171 | rand_win.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h |
| 150 | rand_win.o: ../../include/openssl/err.h ../../include/openssl/evp.h | 172 | rand_win.o: ../../include/openssl/err.h ../../include/openssl/evp.h |
| 151 | rand_win.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h | 173 | rand_win.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h |
| 152 | rand_win.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h | 174 | rand_win.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h |
| 175 | rand_win.o: ../../include/openssl/opensslconf.h | ||
| 153 | rand_win.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | 176 | rand_win.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 154 | rand_win.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h | 177 | rand_win.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h |
| 155 | rand_win.o: ../../include/openssl/sha.h ../../include/openssl/stack.h | 178 | 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 88088ce73c..0f8dd3e00f 100644 --- a/src/lib/libcrypto/rand/md_rand.c +++ b/src/lib/libcrypto/rand/md_rand.c | |||
| @@ -126,6 +126,10 @@ | |||
| 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 | |||
| 129 | 133 | ||
| 130 | #ifdef BN_DEBUG | 134 | #ifdef BN_DEBUG |
| 131 | # define PREDICT | 135 | # define PREDICT |
| @@ -145,7 +149,7 @@ static unsigned int crypto_lock_rand = 0; /* may be set only when a thread | |||
| 145 | * holds CRYPTO_LOCK_RAND | 149 | * holds CRYPTO_LOCK_RAND |
| 146 | * (to prevent double locking) */ | 150 | * (to prevent double locking) */ |
| 147 | /* access to lockin_thread is synchronized by CRYPTO_LOCK_RAND2 */ | 151 | /* access to lockin_thread is synchronized by CRYPTO_LOCK_RAND2 */ |
| 148 | static CRYPTO_THREADID locking_threadid; /* valid iff crypto_lock_rand is set */ | 152 | static unsigned long locking_thread = 0; /* valid iff crypto_lock_rand is set */ |
| 149 | 153 | ||
| 150 | 154 | ||
| 151 | #ifdef PREDICT | 155 | #ifdef PREDICT |
| @@ -213,10 +217,8 @@ static void ssleay_rand_add(const void *buf, int num, double add) | |||
| 213 | /* check if we already have the lock */ | 217 | /* check if we already have the lock */ |
| 214 | if (crypto_lock_rand) | 218 | if (crypto_lock_rand) |
| 215 | { | 219 | { |
| 216 | CRYPTO_THREADID cur; | ||
| 217 | CRYPTO_THREADID_current(&cur); | ||
| 218 | CRYPTO_r_lock(CRYPTO_LOCK_RAND2); | 220 | CRYPTO_r_lock(CRYPTO_LOCK_RAND2); |
| 219 | do_not_lock = !CRYPTO_THREADID_cmp(&locking_threadid, &cur); | 221 | do_not_lock = (locking_thread == CRYPTO_thread_id()); |
| 220 | CRYPTO_r_unlock(CRYPTO_LOCK_RAND2); | 222 | CRYPTO_r_unlock(CRYPTO_LOCK_RAND2); |
| 221 | } | 223 | } |
| 222 | else | 224 | else |
| @@ -272,16 +274,8 @@ static void ssleay_rand_add(const void *buf, int num, double add) | |||
| 272 | } | 274 | } |
| 273 | else | 275 | else |
| 274 | MD_Update(&m,&(state[st_idx]),j); | 276 | MD_Update(&m,&(state[st_idx]),j); |
| 275 | 277 | ||
| 276 | /* DO NOT REMOVE THE FOLLOWING CALL TO MD_Update()! */ | ||
| 277 | MD_Update(&m,buf,j); | 278 | MD_Update(&m,buf,j); |
| 278 | /* We know that line may cause programs such as | ||
| 279 | purify and valgrind to complain about use of | ||
| 280 | uninitialized data. The problem is not, it's | ||
| 281 | with the caller. Removing that line will make | ||
| 282 | sure you get really bad randomness and thereby | ||
| 283 | other problems such as very insecure keys. */ | ||
| 284 | |||
| 285 | MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c)); | 279 | MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c)); |
| 286 | MD_Final(&m,local_md); | 280 | MD_Final(&m,local_md); |
| 287 | md_c[1]++; | 281 | md_c[1]++; |
| @@ -342,6 +336,14 @@ static int ssleay_rand_bytes(unsigned char *buf, int num) | |||
| 342 | #endif | 336 | #endif |
| 343 | int do_stir_pool = 0; | 337 | int do_stir_pool = 0; |
| 344 | 338 | ||
| 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 | |||
| 345 | #ifdef PREDICT | 347 | #ifdef PREDICT |
| 346 | if (rand_predictable) | 348 | if (rand_predictable) |
| 347 | { | 349 | { |
| @@ -382,7 +384,7 @@ static int ssleay_rand_bytes(unsigned char *buf, int num) | |||
| 382 | 384 | ||
| 383 | /* prevent ssleay_rand_bytes() from trying to obtain the lock again */ | 385 | /* prevent ssleay_rand_bytes() from trying to obtain the lock again */ |
| 384 | CRYPTO_w_lock(CRYPTO_LOCK_RAND2); | 386 | CRYPTO_w_lock(CRYPTO_LOCK_RAND2); |
| 385 | CRYPTO_THREADID_current(&locking_threadid); | 387 | locking_thread = CRYPTO_thread_id(); |
| 386 | CRYPTO_w_unlock(CRYPTO_LOCK_RAND2); | 388 | CRYPTO_w_unlock(CRYPTO_LOCK_RAND2); |
| 387 | crypto_lock_rand = 1; | 389 | crypto_lock_rand = 1; |
| 388 | 390 | ||
| @@ -474,15 +476,9 @@ static int ssleay_rand_bytes(unsigned char *buf, int num) | |||
| 474 | #endif | 476 | #endif |
| 475 | MD_Update(&m,local_md,MD_DIGEST_LENGTH); | 477 | MD_Update(&m,local_md,MD_DIGEST_LENGTH); |
| 476 | MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c)); | 478 | MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c)); |
| 477 | 479 | #ifndef PURIFY | |
| 478 | #ifndef PURIFY /* purify complains */ | 480 | MD_Update(&m,buf,j); /* purify complains */ |
| 479 | /* DO NOT REMOVE THE FOLLOWING CALL TO MD_Update()! */ | ||
| 480 | MD_Update(&m,buf,j); | ||
| 481 | /* We know that line may cause programs such as | ||
| 482 | purify and valgrind to complain about use of | ||
| 483 | uninitialized data. */ | ||
| 484 | #endif | 481 | #endif |
| 485 | |||
| 486 | k=(st_idx+MD_DIGEST_LENGTH/2)-st_num; | 482 | k=(st_idx+MD_DIGEST_LENGTH/2)-st_num; |
| 487 | if (k > 0) | 483 | if (k > 0) |
| 488 | { | 484 | { |
| @@ -543,17 +539,15 @@ static int ssleay_rand_pseudo_bytes(unsigned char *buf, int num) | |||
| 543 | 539 | ||
| 544 | static int ssleay_rand_status(void) | 540 | static int ssleay_rand_status(void) |
| 545 | { | 541 | { |
| 546 | CRYPTO_THREADID cur; | ||
| 547 | int ret; | 542 | int ret; |
| 548 | int do_not_lock; | 543 | int do_not_lock; |
| 549 | 544 | ||
| 550 | CRYPTO_THREADID_current(&cur); | ||
| 551 | /* check if we already have the lock | 545 | /* check if we already have the lock |
| 552 | * (could happen if a RAND_poll() implementation calls RAND_status()) */ | 546 | * (could happen if a RAND_poll() implementation calls RAND_status()) */ |
| 553 | if (crypto_lock_rand) | 547 | if (crypto_lock_rand) |
| 554 | { | 548 | { |
| 555 | CRYPTO_r_lock(CRYPTO_LOCK_RAND2); | 549 | CRYPTO_r_lock(CRYPTO_LOCK_RAND2); |
| 556 | do_not_lock = !CRYPTO_THREADID_cmp(&locking_threadid, &cur); | 550 | do_not_lock = (locking_thread == CRYPTO_thread_id()); |
| 557 | CRYPTO_r_unlock(CRYPTO_LOCK_RAND2); | 551 | CRYPTO_r_unlock(CRYPTO_LOCK_RAND2); |
| 558 | } | 552 | } |
| 559 | else | 553 | else |
| @@ -565,7 +559,7 @@ static int ssleay_rand_status(void) | |||
| 565 | 559 | ||
| 566 | /* prevent ssleay_rand_bytes() from trying to obtain the lock again */ | 560 | /* prevent ssleay_rand_bytes() from trying to obtain the lock again */ |
| 567 | CRYPTO_w_lock(CRYPTO_LOCK_RAND2); | 561 | CRYPTO_w_lock(CRYPTO_LOCK_RAND2); |
| 568 | CRYPTO_THREADID_cpy(&locking_threadid, &cur); | 562 | locking_thread = CRYPTO_thread_id(); |
| 569 | CRYPTO_w_unlock(CRYPTO_LOCK_RAND2); | 563 | CRYPTO_w_unlock(CRYPTO_LOCK_RAND2); |
| 570 | crypto_lock_rand = 1; | 564 | crypto_lock_rand = 1; |
| 571 | } | 565 | } |
diff --git a/src/lib/libcrypto/rand/rand.h b/src/lib/libcrypto/rand/rand.h new file mode 100644 index 0000000000..ea89153cba --- /dev/null +++ b/src/lib/libcrypto/rand/rand.h | |||
| @@ -0,0 +1,167 @@ | |||
| 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 int | ||
| 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 | #ifndef OPENSSL_NO_ENGINE | ||
| 115 | #ifdef OPENSSL_FIPS | ||
| 116 | void int_RAND_init_engine_callbacks(void); | ||
| 117 | void int_RAND_set_callbacks( | ||
| 118 | int (*set_rand_func)(const RAND_METHOD *meth, | ||
| 119 | const RAND_METHOD **pmeth), | ||
| 120 | const RAND_METHOD *(*get_rand_func)(const RAND_METHOD **pmeth)); | ||
| 121 | #endif | ||
| 122 | #endif | ||
| 123 | |||
| 124 | #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) | ||
| 125 | |||
| 126 | void RAND_screen(void); | ||
| 127 | int RAND_event(UINT, WPARAM, LPARAM); | ||
| 128 | |||
| 129 | #endif | ||
| 130 | |||
| 131 | /* BEGIN ERROR CODES */ | ||
| 132 | /* The following lines are auto generated by the script mkerr.pl. Any changes | ||
| 133 | * made after this point may be overwritten when the script is next run. | ||
| 134 | */ | ||
| 135 | void ERR_load_RAND_strings(void); | ||
| 136 | |||
| 137 | /* Error codes for the RAND functions. */ | ||
| 138 | |||
| 139 | /* Function codes. */ | ||
| 140 | #define RAND_F_ENG_RAND_GET_RAND_METHOD 108 | ||
| 141 | #define RAND_F_FIPS_RAND 103 | ||
| 142 | #define RAND_F_FIPS_RAND_BYTES 102 | ||
| 143 | #define RAND_F_FIPS_RAND_GET_RAND_METHOD 109 | ||
| 144 | #define RAND_F_FIPS_RAND_SET_DT 106 | ||
| 145 | #define RAND_F_FIPS_SET_DT 104 | ||
| 146 | #define RAND_F_FIPS_SET_PRNG_SEED 107 | ||
| 147 | #define RAND_F_FIPS_SET_TEST_MODE 105 | ||
| 148 | #define RAND_F_RAND_GET_RAND_METHOD 101 | ||
| 149 | #define RAND_F_SSLEAY_RAND_BYTES 100 | ||
| 150 | |||
| 151 | /* Reason codes. */ | ||
| 152 | #define RAND_R_NON_FIPS_METHOD 105 | ||
| 153 | #define RAND_R_NOT_IN_TEST_MODE 106 | ||
| 154 | #define RAND_R_NO_KEY_SET 107 | ||
| 155 | #define RAND_R_PRNG_ASKING_FOR_TOO_MUCH 101 | ||
| 156 | #define RAND_R_PRNG_ERROR 108 | ||
| 157 | #define RAND_R_PRNG_KEYED 109 | ||
| 158 | #define RAND_R_PRNG_NOT_REKEYED 102 | ||
| 159 | #define RAND_R_PRNG_NOT_RESEEDED 103 | ||
| 160 | #define RAND_R_PRNG_NOT_SEEDED 100 | ||
| 161 | #define RAND_R_PRNG_SEED_MUST_NOT_MATCH_KEY 110 | ||
| 162 | #define RAND_R_PRNG_STUCK 104 | ||
| 163 | |||
| 164 | #ifdef __cplusplus | ||
| 165 | } | ||
| 166 | #endif | ||
| 167 | #endif | ||
diff --git a/src/lib/libcrypto/rand/rand_egd.c b/src/lib/libcrypto/rand/rand_egd.c index d53b916ebe..50bce6caba 100644 --- a/src/lib/libcrypto/rand/rand_egd.c +++ b/src/lib/libcrypto/rand/rand_egd.c | |||
| @@ -95,7 +95,7 @@ | |||
| 95 | * RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255. | 95 | * RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255. |
| 96 | */ | 96 | */ |
| 97 | 97 | ||
| 98 | #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_VOS) || defined(OPENSSL_SYS_BEOS) | 98 | #if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_VOS) |
| 99 | int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes) | 99 | int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes) |
| 100 | { | 100 | { |
| 101 | return(-1); | 101 | return(-1); |
diff --git a/src/lib/libcrypto/rand/rand_err.c b/src/lib/libcrypto/rand/rand_err.c new file mode 100644 index 0000000000..829fb44d77 --- /dev/null +++ b/src/lib/libcrypto/rand/rand_err.c | |||
| @@ -0,0 +1,114 @@ | |||
| 1 | /* crypto/rand/rand_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/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_ENG_RAND_GET_RAND_METHOD), "ENG_RAND_GET_RAND_METHOD"}, | ||
| 74 | {ERR_FUNC(RAND_F_FIPS_RAND), "FIPS_RAND"}, | ||
| 75 | {ERR_FUNC(RAND_F_FIPS_RAND_BYTES), "FIPS_RAND_BYTES"}, | ||
| 76 | {ERR_FUNC(RAND_F_FIPS_RAND_GET_RAND_METHOD), "FIPS_RAND_GET_RAND_METHOD"}, | ||
| 77 | {ERR_FUNC(RAND_F_FIPS_RAND_SET_DT), "FIPS_RAND_SET_DT"}, | ||
| 78 | {ERR_FUNC(RAND_F_FIPS_SET_DT), "FIPS_SET_DT"}, | ||
| 79 | {ERR_FUNC(RAND_F_FIPS_SET_PRNG_SEED), "FIPS_SET_PRNG_SEED"}, | ||
| 80 | {ERR_FUNC(RAND_F_FIPS_SET_TEST_MODE), "FIPS_SET_TEST_MODE"}, | ||
| 81 | {ERR_FUNC(RAND_F_RAND_GET_RAND_METHOD), "RAND_get_rand_method"}, | ||
| 82 | {ERR_FUNC(RAND_F_SSLEAY_RAND_BYTES), "SSLEAY_RAND_BYTES"}, | ||
| 83 | {0,NULL} | ||
| 84 | }; | ||
| 85 | |||
| 86 | static ERR_STRING_DATA RAND_str_reasons[]= | ||
| 87 | { | ||
| 88 | {ERR_REASON(RAND_R_NON_FIPS_METHOD) ,"non fips method"}, | ||
| 89 | {ERR_REASON(RAND_R_NOT_IN_TEST_MODE) ,"not in test mode"}, | ||
| 90 | {ERR_REASON(RAND_R_NO_KEY_SET) ,"no key set"}, | ||
| 91 | {ERR_REASON(RAND_R_PRNG_ASKING_FOR_TOO_MUCH),"prng asking for too much"}, | ||
| 92 | {ERR_REASON(RAND_R_PRNG_ERROR) ,"prng error"}, | ||
| 93 | {ERR_REASON(RAND_R_PRNG_KEYED) ,"prng keyed"}, | ||
| 94 | {ERR_REASON(RAND_R_PRNG_NOT_REKEYED) ,"prng not rekeyed"}, | ||
| 95 | {ERR_REASON(RAND_R_PRNG_NOT_RESEEDED) ,"prng not reseeded"}, | ||
| 96 | {ERR_REASON(RAND_R_PRNG_NOT_SEEDED) ,"PRNG not seeded"}, | ||
| 97 | {ERR_REASON(RAND_R_PRNG_SEED_MUST_NOT_MATCH_KEY),"prng seed must not match key"}, | ||
| 98 | {ERR_REASON(RAND_R_PRNG_STUCK) ,"prng stuck"}, | ||
| 99 | {0,NULL} | ||
| 100 | }; | ||
| 101 | |||
| 102 | #endif | ||
| 103 | |||
| 104 | void ERR_load_RAND_strings(void) | ||
| 105 | { | ||
| 106 | #ifndef OPENSSL_NO_ERR | ||
| 107 | |||
| 108 | if (ERR_func_error_string(RAND_str_functs[0].error) == NULL) | ||
| 109 | { | ||
| 110 | ERR_load_strings(0,RAND_str_functs); | ||
| 111 | ERR_load_strings(0,RAND_str_reasons); | ||
| 112 | } | ||
| 113 | #endif | ||
| 114 | } | ||
diff --git a/src/lib/libcrypto/rand/rand_lcl.h b/src/lib/libcrypto/rand/rand_lcl.h index 618a8ec899..18cc9b1e4a 100644 --- a/src/lib/libcrypto/rand/rand_lcl.h +++ b/src/lib/libcrypto/rand/rand_lcl.h | |||
| @@ -154,5 +154,16 @@ | |||
| 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 | |||
| 157 | 168 | ||
| 158 | #endif | 169 | #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..da6b4e0e86 --- /dev/null +++ b/src/lib/libcrypto/rand/rand_lib.c | |||
| @@ -0,0 +1,245 @@ | |||
| 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 | #include "rand_lcl.h" | ||
| 64 | #ifdef OPENSSL_FIPS | ||
| 65 | #include <openssl/fips.h> | ||
| 66 | #include <openssl/fips_rand.h> | ||
| 67 | #endif | ||
| 68 | |||
| 69 | #ifndef OPENSSL_NO_ENGINE | ||
| 70 | #include <openssl/engine.h> | ||
| 71 | #endif | ||
| 72 | |||
| 73 | static const RAND_METHOD *default_RAND_meth = NULL; | ||
| 74 | |||
| 75 | #ifdef OPENSSL_FIPS | ||
| 76 | |||
| 77 | static int fips_RAND_set_rand_method(const RAND_METHOD *meth, | ||
| 78 | const RAND_METHOD **pmeth) | ||
| 79 | { | ||
| 80 | *pmeth = meth; | ||
| 81 | return 1; | ||
| 82 | } | ||
| 83 | |||
| 84 | static const RAND_METHOD *fips_RAND_get_rand_method(const RAND_METHOD **pmeth) | ||
| 85 | { | ||
| 86 | if (!*pmeth) | ||
| 87 | { | ||
| 88 | if(FIPS_mode()) | ||
| 89 | *pmeth=FIPS_rand_method(); | ||
| 90 | else | ||
| 91 | *pmeth = RAND_SSLeay(); | ||
| 92 | } | ||
| 93 | |||
| 94 | if(FIPS_mode() | ||
| 95 | && *pmeth != FIPS_rand_check()) | ||
| 96 | { | ||
| 97 | RANDerr(RAND_F_FIPS_RAND_GET_RAND_METHOD,RAND_R_NON_FIPS_METHOD); | ||
| 98 | return 0; | ||
| 99 | } | ||
| 100 | |||
| 101 | return *pmeth; | ||
| 102 | } | ||
| 103 | |||
| 104 | static int (*RAND_set_rand_method_func)(const RAND_METHOD *meth, | ||
| 105 | const RAND_METHOD **pmeth) | ||
| 106 | = fips_RAND_set_rand_method; | ||
| 107 | static const RAND_METHOD *(*RAND_get_rand_method_func) | ||
| 108 | (const RAND_METHOD **pmeth) | ||
| 109 | = fips_RAND_get_rand_method; | ||
| 110 | |||
| 111 | #ifndef OPENSSL_NO_ENGINE | ||
| 112 | void int_RAND_set_callbacks( | ||
| 113 | int (*set_rand_func)(const RAND_METHOD *meth, | ||
| 114 | const RAND_METHOD **pmeth), | ||
| 115 | const RAND_METHOD *(*get_rand_func) | ||
| 116 | (const RAND_METHOD **pmeth)) | ||
| 117 | { | ||
| 118 | RAND_set_rand_method_func = set_rand_func; | ||
| 119 | RAND_get_rand_method_func = get_rand_func; | ||
| 120 | } | ||
| 121 | #endif | ||
| 122 | |||
| 123 | int RAND_set_rand_method(const RAND_METHOD *meth) | ||
| 124 | { | ||
| 125 | return RAND_set_rand_method_func(meth, &default_RAND_meth); | ||
| 126 | } | ||
| 127 | |||
| 128 | const RAND_METHOD *RAND_get_rand_method(void) | ||
| 129 | { | ||
| 130 | return RAND_get_rand_method_func(&default_RAND_meth); | ||
| 131 | } | ||
| 132 | |||
| 133 | #else | ||
| 134 | |||
| 135 | #ifndef OPENSSL_NO_ENGINE | ||
| 136 | /* non-NULL if default_RAND_meth is ENGINE-provided */ | ||
| 137 | static ENGINE *funct_ref =NULL; | ||
| 138 | #endif | ||
| 139 | |||
| 140 | int RAND_set_rand_method(const RAND_METHOD *meth) | ||
| 141 | { | ||
| 142 | #ifndef OPENSSL_NO_ENGINE | ||
| 143 | if(funct_ref) | ||
| 144 | { | ||
| 145 | ENGINE_finish(funct_ref); | ||
| 146 | funct_ref = NULL; | ||
| 147 | } | ||
| 148 | #endif | ||
| 149 | default_RAND_meth = meth; | ||
| 150 | return 1; | ||
| 151 | } | ||
| 152 | |||
| 153 | const RAND_METHOD *RAND_get_rand_method(void) | ||
| 154 | { | ||
| 155 | if (!default_RAND_meth) | ||
| 156 | { | ||
| 157 | #ifndef OPENSSL_NO_ENGINE | ||
| 158 | ENGINE *e = ENGINE_get_default_RAND(); | ||
| 159 | if(e) | ||
| 160 | { | ||
| 161 | default_RAND_meth = ENGINE_get_RAND(e); | ||
| 162 | if(!default_RAND_meth) | ||
| 163 | { | ||
| 164 | ENGINE_finish(e); | ||
| 165 | e = NULL; | ||
| 166 | } | ||
| 167 | } | ||
| 168 | if(e) | ||
| 169 | funct_ref = e; | ||
| 170 | else | ||
| 171 | #endif | ||
| 172 | default_RAND_meth = RAND_SSLeay(); | ||
| 173 | } | ||
| 174 | return default_RAND_meth; | ||
| 175 | } | ||
| 176 | |||
| 177 | #ifndef OPENSSL_NO_ENGINE | ||
| 178 | int RAND_set_rand_engine(ENGINE *engine) | ||
| 179 | { | ||
| 180 | const RAND_METHOD *tmp_meth = NULL; | ||
| 181 | if(engine) | ||
| 182 | { | ||
| 183 | if(!ENGINE_init(engine)) | ||
| 184 | return 0; | ||
| 185 | tmp_meth = ENGINE_get_RAND(engine); | ||
| 186 | if(!tmp_meth) | ||
| 187 | { | ||
| 188 | ENGINE_finish(engine); | ||
| 189 | return 0; | ||
| 190 | } | ||
| 191 | } | ||
| 192 | /* This function releases any prior ENGINE so call it first */ | ||
| 193 | RAND_set_rand_method(tmp_meth); | ||
| 194 | funct_ref = engine; | ||
| 195 | return 1; | ||
| 196 | } | ||
| 197 | #endif | ||
| 198 | |||
| 199 | #endif | ||
| 200 | |||
| 201 | void RAND_cleanup(void) | ||
| 202 | { | ||
| 203 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 204 | if (meth && meth->cleanup) | ||
| 205 | meth->cleanup(); | ||
| 206 | RAND_set_rand_method(NULL); | ||
| 207 | } | ||
| 208 | |||
| 209 | void RAND_seed(const void *buf, int num) | ||
| 210 | { | ||
| 211 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 212 | if (meth && meth->seed) | ||
| 213 | meth->seed(buf,num); | ||
| 214 | } | ||
| 215 | |||
| 216 | void RAND_add(const void *buf, int num, double entropy) | ||
| 217 | { | ||
| 218 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 219 | if (meth && meth->add) | ||
| 220 | meth->add(buf,num,entropy); | ||
| 221 | } | ||
| 222 | |||
| 223 | int RAND_bytes(unsigned char *buf, int num) | ||
| 224 | { | ||
| 225 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 226 | if (meth && meth->bytes) | ||
| 227 | return meth->bytes(buf,num); | ||
| 228 | return(-1); | ||
| 229 | } | ||
| 230 | |||
| 231 | int RAND_pseudo_bytes(unsigned char *buf, int num) | ||
| 232 | { | ||
| 233 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 234 | if (meth && meth->pseudorand) | ||
| 235 | return meth->pseudorand(buf,num); | ||
| 236 | return(-1); | ||
| 237 | } | ||
| 238 | |||
| 239 | int RAND_status(void) | ||
| 240 | { | ||
| 241 | const RAND_METHOD *meth = RAND_get_rand_method(); | ||
| 242 | if (meth && meth->status) | ||
| 243 | return meth->status(); | ||
| 244 | return 0; | ||
| 245 | } | ||
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_os2.c b/src/lib/libcrypto/rand/rand_os2.c index fc1e78b179..c3e36d4e5e 100644 --- a/src/lib/libcrypto/rand/rand_os2.c +++ b/src/lib/libcrypto/rand/rand_os2.c | |||
| @@ -78,10 +78,8 @@ typedef struct _CPUUTIL { | |||
| 78 | ULONG ulIntrHigh; /* High 32 bits of interrupt time */ | 78 | ULONG ulIntrHigh; /* High 32 bits of interrupt time */ |
| 79 | } CPUUTIL; | 79 | } CPUUTIL; |
| 80 | 80 | ||
| 81 | #ifndef __KLIBC__ | ||
| 82 | APIRET APIENTRY(*DosPerfSysCall) (ULONG ulCommand, ULONG ulParm1, ULONG ulParm2, ULONG ulParm3) = NULL; | 81 | APIRET APIENTRY(*DosPerfSysCall) (ULONG ulCommand, ULONG ulParm1, ULONG ulParm2, ULONG ulParm3) = NULL; |
| 83 | APIRET APIENTRY(*DosQuerySysState) (ULONG func, ULONG arg1, ULONG pid, ULONG _res_, PVOID buf, ULONG bufsz) = NULL; | 82 | APIRET APIENTRY(*DosQuerySysState) (ULONG func, ULONG arg1, ULONG pid, ULONG _res_, PVOID buf, ULONG bufsz) = NULL; |
| 84 | #endif | ||
| 85 | HMODULE hDoscalls = 0; | 83 | HMODULE hDoscalls = 0; |
| 86 | 84 | ||
| 87 | int RAND_poll(void) | 85 | int RAND_poll(void) |
| @@ -93,7 +91,6 @@ int RAND_poll(void) | |||
| 93 | if (hDoscalls == 0) { | 91 | if (hDoscalls == 0) { |
| 94 | ULONG rc = DosLoadModule(failed_module, sizeof(failed_module), "DOSCALLS", &hDoscalls); | 92 | ULONG rc = DosLoadModule(failed_module, sizeof(failed_module), "DOSCALLS", &hDoscalls); |
| 95 | 93 | ||
| 96 | #ifndef __KLIBC__ | ||
| 97 | if (rc == 0) { | 94 | if (rc == 0) { |
| 98 | rc = DosQueryProcAddr(hDoscalls, 976, NULL, (PFN *)&DosPerfSysCall); | 95 | rc = DosQueryProcAddr(hDoscalls, 976, NULL, (PFN *)&DosPerfSysCall); |
| 99 | 96 | ||
| @@ -105,7 +102,6 @@ int RAND_poll(void) | |||
| 105 | if (rc) | 102 | if (rc) |
| 106 | DosQuerySysState = NULL; | 103 | DosQuerySysState = NULL; |
| 107 | } | 104 | } |
| 108 | #endif | ||
| 109 | } | 105 | } |
| 110 | 106 | ||
| 111 | /* Sample the hi-res timer, runs at around 1.1 MHz */ | 107 | /* Sample the hi-res timer, runs at around 1.1 MHz */ |
| @@ -126,9 +122,7 @@ int RAND_poll(void) | |||
| 126 | RAND_add(&util, sizeof(util), 10); | 122 | RAND_add(&util, sizeof(util), 10); |
| 127 | } | 123 | } |
| 128 | else { | 124 | else { |
| 129 | #ifndef __KLIBC__ | ||
| 130 | DosPerfSysCall = NULL; | 125 | DosPerfSysCall = NULL; |
| 131 | #endif | ||
| 132 | } | 126 | } |
| 133 | } | 127 | } |
| 134 | 128 | ||
diff --git a/src/lib/libcrypto/rand/rand_unix.c b/src/lib/libcrypto/rand/rand_unix.c index e9ead3a529..58c6173094 100644 --- a/src/lib/libcrypto/rand/rand_unix.c +++ b/src/lib/libcrypto/rand/rand_unix.c | |||
| @@ -133,62 +133,13 @@ | |||
| 133 | # define FD_SETSIZE (8*sizeof(fd_set)) | 133 | # define FD_SETSIZE (8*sizeof(fd_set)) |
| 134 | #endif | 134 | #endif |
| 135 | 135 | ||
| 136 | #ifdef __VOS__ | 136 | #ifdef __OpenBSD__ |
| 137 | int RAND_poll(void) | 137 | int RAND_poll(void) |
| 138 | { | 138 | { |
| 139 | unsigned char buf[ENTROPY_NEEDED]; | 139 | unsigned char buf[ENTROPY_NEEDED]; |
| 140 | pid_t curr_pid; | ||
| 141 | uid_t curr_uid; | ||
| 142 | static int first=1; | ||
| 143 | int i; | ||
| 144 | long rnd = 0; | ||
| 145 | struct timespec ts; | ||
| 146 | unsigned seed; | ||
| 147 | 140 | ||
| 148 | /* The VOS random() function starts from a static seed so its | 141 | arc4random_buf(buf, sizeof(buf)); |
| 149 | initial value is predictable. If random() returns the | 142 | RAND_add(buf, sizeof(buf), sizeof(buf)); |
| 150 | initial value, reseed it with dynamic data. The VOS | ||
| 151 | real-time clock has a granularity of 1 nsec so it should be | ||
| 152 | reasonably difficult to predict its exact value. Do not | ||
| 153 | gratuitously reseed the PRNG because other code in this | ||
| 154 | process or thread may be using it. */ | ||
| 155 | |||
| 156 | if (first) { | ||
| 157 | first = 0; | ||
| 158 | rnd = random (); | ||
| 159 | if (rnd == 1804289383) { | ||
| 160 | clock_gettime (CLOCK_REALTIME, &ts); | ||
| 161 | curr_pid = getpid(); | ||
| 162 | curr_uid = getuid(); | ||
| 163 | seed = ts.tv_sec ^ ts.tv_nsec ^ curr_pid ^ curr_uid; | ||
| 164 | srandom (seed); | ||
| 165 | } | ||
| 166 | } | ||
| 167 | |||
| 168 | for (i = 0; i < sizeof(buf); i++) { | ||
| 169 | if (i % 4 == 0) | ||
| 170 | rnd = random(); | ||
| 171 | buf[i] = rnd; | ||
| 172 | rnd >>= 8; | ||
| 173 | } | ||
| 174 | RAND_add(buf, sizeof(buf), ENTROPY_NEEDED); | ||
| 175 | memset(buf, 0, sizeof(buf)); | ||
| 176 | |||
| 177 | return 1; | ||
| 178 | } | ||
| 179 | #elif defined __OpenBSD__ | ||
| 180 | int RAND_poll(void) | ||
| 181 | { | ||
| 182 | u_int32_t rnd = 0, i; | ||
| 183 | unsigned char buf[ENTROPY_NEEDED]; | ||
| 184 | |||
| 185 | for (i = 0; i < sizeof(buf); i++) { | ||
| 186 | if (i % 4 == 0) | ||
| 187 | rnd = arc4random(); | ||
| 188 | buf[i] = rnd; | ||
| 189 | rnd >>= 8; | ||
| 190 | } | ||
| 191 | RAND_add(buf, sizeof(buf), ENTROPY_NEEDED); | ||
| 192 | memset(buf, 0, sizeof(buf)); | 143 | memset(buf, 0, sizeof(buf)); |
| 193 | 144 | ||
| 194 | return 1; | 145 | return 1; |
| @@ -206,7 +157,7 @@ int RAND_poll(void) | |||
| 206 | static const char *randomfiles[] = { DEVRANDOM }; | 157 | static const char *randomfiles[] = { DEVRANDOM }; |
| 207 | struct stat randomstats[sizeof(randomfiles)/sizeof(randomfiles[0])]; | 158 | struct stat randomstats[sizeof(randomfiles)/sizeof(randomfiles[0])]; |
| 208 | int fd; | 159 | int fd; |
| 209 | unsigned int i; | 160 | size_t i; |
| 210 | #endif | 161 | #endif |
| 211 | #ifdef DEVRANDOM_EGD | 162 | #ifdef DEVRANDOM_EGD |
| 212 | static const char *egdsockets[] = { DEVRANDOM_EGD, NULL }; | 163 | static const char *egdsockets[] = { DEVRANDOM_EGD, NULL }; |
| @@ -219,8 +170,7 @@ int RAND_poll(void) | |||
| 219 | * have this. Use /dev/urandom if you can as /dev/random may block | 170 | * have this. Use /dev/urandom if you can as /dev/random may block |
| 220 | * if it runs out of random entries. */ | 171 | * if it runs out of random entries. */ |
| 221 | 172 | ||
| 222 | for (i = 0; (i < sizeof(randomfiles)/sizeof(randomfiles[0])) && | 173 | for (i=0; i<sizeof(randomfiles)/sizeof(randomfiles[0]) && n < ENTROPY_NEEDED; i++) |
| 223 | (n < ENTROPY_NEEDED); i++) | ||
| 224 | { | 174 | { |
| 225 | if ((fd = open(randomfiles[i], O_RDONLY | 175 | if ((fd = open(randomfiles[i], O_RDONLY |
| 226 | #ifdef O_NONBLOCK | 176 | #ifdef O_NONBLOCK |
| @@ -237,7 +187,7 @@ int RAND_poll(void) | |||
| 237 | { | 187 | { |
| 238 | int usec = 10*1000; /* spend 10ms on each file */ | 188 | int usec = 10*1000; /* spend 10ms on each file */ |
| 239 | int r; | 189 | int r; |
| 240 | unsigned int j; | 190 | size_t j; |
| 241 | struct stat *st=&randomstats[i]; | 191 | struct stat *st=&randomstats[i]; |
| 242 | 192 | ||
| 243 | /* Avoid using same input... Used to be O_NOFOLLOW | 193 | /* Avoid using same input... Used to be O_NOFOLLOW |
| @@ -255,12 +205,7 @@ int RAND_poll(void) | |||
| 255 | { | 205 | { |
| 256 | int try_read = 0; | 206 | int try_read = 0; |
| 257 | 207 | ||
| 258 | #if defined(OPENSSL_SYS_BEOS_R5) | 208 | #if defined(OPENSSL_SYS_LINUX) |
| 259 | /* select() is broken in BeOS R5, so we simply | ||
| 260 | * try to read something and snooze if we couldn't */ | ||
| 261 | try_read = 1; | ||
| 262 | |||
| 263 | #elif defined(OPENSSL_SYS_LINUX) | ||
| 264 | /* use poll() */ | 209 | /* use poll() */ |
| 265 | struct pollfd pset; | 210 | struct pollfd pset; |
| 266 | 211 | ||
| @@ -307,10 +252,6 @@ int RAND_poll(void) | |||
| 307 | r = read(fd,(unsigned char *)tmpbuf+n, ENTROPY_NEEDED-n); | 252 | r = read(fd,(unsigned char *)tmpbuf+n, ENTROPY_NEEDED-n); |
| 308 | if (r > 0) | 253 | if (r > 0) |
| 309 | n += r; | 254 | n += r; |
| 310 | #if defined(OPENSSL_SYS_BEOS_R5) | ||
| 311 | if (r == 0) | ||
| 312 | snooze(t.tv_usec); | ||
| 313 | #endif | ||
| 314 | } | 255 | } |
| 315 | else | 256 | else |
| 316 | r = -1; | 257 | r = -1; |
| @@ -364,14 +305,6 @@ int RAND_poll(void) | |||
| 364 | l=time(NULL); | 305 | l=time(NULL); |
| 365 | RAND_add(&l,sizeof(l),0.0); | 306 | RAND_add(&l,sizeof(l),0.0); |
| 366 | 307 | ||
| 367 | #if defined(OPENSSL_SYS_BEOS) | ||
| 368 | { | ||
| 369 | system_info sysInfo; | ||
| 370 | get_system_info(&sysInfo); | ||
| 371 | RAND_add(&sysInfo,sizeof(sysInfo),0); | ||
| 372 | } | ||
| 373 | #endif | ||
| 374 | |||
| 375 | #if defined(DEVRANDOM) || defined(DEVRANDOM_EGD) | 308 | #if defined(DEVRANDOM) || defined(DEVRANDOM_EGD) |
| 376 | return 1; | 309 | return 1; |
| 377 | #else | 310 | #else |
diff --git a/src/lib/libcrypto/rand/rand_win.c b/src/lib/libcrypto/rand/rand_win.c index 5d134e186b..00dbe4232c 100644 --- a/src/lib/libcrypto/rand/rand_win.c +++ b/src/lib/libcrypto/rand/rand_win.c | |||
| @@ -463,7 +463,7 @@ int RAND_poll(void) | |||
| 463 | PROCESSENTRY32 p; | 463 | PROCESSENTRY32 p; |
| 464 | THREADENTRY32 t; | 464 | THREADENTRY32 t; |
| 465 | MODULEENTRY32 m; | 465 | MODULEENTRY32 m; |
| 466 | DWORD starttime = 0; | 466 | DWORD stoptime = 0; |
| 467 | 467 | ||
| 468 | snap = (CREATETOOLHELP32SNAPSHOT) | 468 | snap = (CREATETOOLHELP32SNAPSHOT) |
| 469 | GetProcAddress(kernel, "CreateToolhelp32Snapshot"); | 469 | GetProcAddress(kernel, "CreateToolhelp32Snapshot"); |
| @@ -494,29 +494,12 @@ int RAND_poll(void) | |||
| 494 | * each entry. Consider each field a source of 1 byte | 494 | * each entry. Consider each field a source of 1 byte |
| 495 | * of entropy. | 495 | * of entropy. |
| 496 | */ | 496 | */ |
| 497 | ZeroMemory(&hlist, sizeof(HEAPLIST32)); | ||
| 498 | hlist.dwSize = sizeof(HEAPLIST32); | 497 | hlist.dwSize = sizeof(HEAPLIST32); |
| 499 | if (good) starttime = GetTickCount(); | 498 | if (good) stoptime = GetTickCount() + MAXDELAY; |
| 500 | #ifdef _MSC_VER | ||
| 501 | if (heaplist_first(handle, &hlist)) | 499 | if (heaplist_first(handle, &hlist)) |
| 502 | { | ||
| 503 | /* | ||
| 504 | following discussion on dev ML, exception on WinCE (or other Win | ||
| 505 | platform) is theoretically of unknown origin; prevent infinite | ||
| 506 | loop here when this theoretical case occurs; otherwise cope with | ||
| 507 | the expected (MSDN documented) exception-throwing behaviour of | ||
| 508 | Heap32Next() on WinCE. | ||
| 509 | |||
| 510 | based on patch in original message by Tanguy Fautré (2009/03/02) | ||
| 511 | Subject: RAND_poll() and CreateToolhelp32Snapshot() stability | ||
| 512 | */ | ||
| 513 | int ex_cnt_limit = 42; | ||
| 514 | do | 500 | do |
| 515 | { | 501 | { |
| 516 | RAND_add(&hlist, hlist.dwSize, 3); | 502 | RAND_add(&hlist, hlist.dwSize, 3); |
| 517 | __try | ||
| 518 | { | ||
| 519 | ZeroMemory(&hentry, sizeof(HEAPENTRY32)); | ||
| 520 | hentry.dwSize = sizeof(HEAPENTRY32); | 503 | hentry.dwSize = sizeof(HEAPENTRY32); |
| 521 | if (heap_first(&hentry, | 504 | if (heap_first(&hentry, |
| 522 | hlist.th32ProcessID, | 505 | hlist.th32ProcessID, |
| @@ -527,42 +510,10 @@ int RAND_poll(void) | |||
| 527 | RAND_add(&hentry, | 510 | RAND_add(&hentry, |
| 528 | hentry.dwSize, 5); | 511 | hentry.dwSize, 5); |
| 529 | while (heap_next(&hentry) | 512 | while (heap_next(&hentry) |
| 530 | && (!good || (GetTickCount()-starttime)<MAXDELAY) | ||
| 531 | && --entrycnt > 0); | 513 | && --entrycnt > 0); |
| 532 | } | 514 | } |
| 533 | } | 515 | } while (heaplist_next(handle, |
| 534 | __except (EXCEPTION_EXECUTE_HANDLER) | 516 | &hlist) && GetTickCount() < stoptime); |
| 535 | { | ||
| 536 | /* ignore access violations when walking the heap list */ | ||
| 537 | ex_cnt_limit--; | ||
| 538 | } | ||
| 539 | } while (heaplist_next(handle, &hlist) | ||
| 540 | && (!good || (GetTickCount()-starttime)<MAXDELAY) | ||
| 541 | && ex_cnt_limit > 0); | ||
| 542 | } | ||
| 543 | |||
| 544 | #else | ||
| 545 | if (heaplist_first(handle, &hlist)) | ||
| 546 | { | ||
| 547 | do | ||
| 548 | { | ||
| 549 | RAND_add(&hlist, hlist.dwSize, 3); | ||
| 550 | hentry.dwSize = sizeof(HEAPENTRY32); | ||
| 551 | if (heap_first(&hentry, | ||
| 552 | hlist.th32ProcessID, | ||
| 553 | hlist.th32HeapID)) | ||
| 554 | { | ||
| 555 | int entrycnt = 80; | ||
| 556 | do | ||
| 557 | RAND_add(&hentry, | ||
| 558 | hentry.dwSize, 5); | ||
| 559 | while (heap_next(&hentry) | ||
| 560 | && --entrycnt > 0); | ||
| 561 | } | ||
| 562 | } while (heaplist_next(handle, &hlist) | ||
| 563 | && (!good || (GetTickCount()-starttime)<MAXDELAY)); | ||
| 564 | } | ||
| 565 | #endif | ||
| 566 | 517 | ||
| 567 | /* process walking */ | 518 | /* process walking */ |
| 568 | /* PROCESSENTRY32 contains 9 fields that will change | 519 | /* PROCESSENTRY32 contains 9 fields that will change |
| @@ -571,11 +522,11 @@ int RAND_poll(void) | |||
| 571 | */ | 522 | */ |
| 572 | p.dwSize = sizeof(PROCESSENTRY32); | 523 | p.dwSize = sizeof(PROCESSENTRY32); |
| 573 | 524 | ||
| 574 | if (good) starttime = GetTickCount(); | 525 | if (good) stoptime = GetTickCount() + MAXDELAY; |
| 575 | if (process_first(handle, &p)) | 526 | if (process_first(handle, &p)) |
| 576 | do | 527 | do |
| 577 | RAND_add(&p, p.dwSize, 9); | 528 | RAND_add(&p, p.dwSize, 9); |
| 578 | while (process_next(handle, &p) && (!good || (GetTickCount()-starttime)<MAXDELAY)); | 529 | while (process_next(handle, &p) && GetTickCount() < stoptime); |
| 579 | 530 | ||
| 580 | /* thread walking */ | 531 | /* thread walking */ |
| 581 | /* THREADENTRY32 contains 6 fields that will change | 532 | /* THREADENTRY32 contains 6 fields that will change |
| @@ -583,11 +534,11 @@ int RAND_poll(void) | |||
| 583 | * 1 byte of entropy. | 534 | * 1 byte of entropy. |
| 584 | */ | 535 | */ |
| 585 | t.dwSize = sizeof(THREADENTRY32); | 536 | t.dwSize = sizeof(THREADENTRY32); |
| 586 | if (good) starttime = GetTickCount(); | 537 | if (good) stoptime = GetTickCount() + MAXDELAY; |
| 587 | if (thread_first(handle, &t)) | 538 | if (thread_first(handle, &t)) |
| 588 | do | 539 | do |
| 589 | RAND_add(&t, t.dwSize, 6); | 540 | RAND_add(&t, t.dwSize, 6); |
| 590 | while (thread_next(handle, &t) && (!good || (GetTickCount()-starttime)<MAXDELAY)); | 541 | while (thread_next(handle, &t) && GetTickCount() < stoptime); |
| 591 | 542 | ||
| 592 | /* module walking */ | 543 | /* module walking */ |
| 593 | /* MODULEENTRY32 contains 9 fields that will change | 544 | /* MODULEENTRY32 contains 9 fields that will change |
| @@ -595,12 +546,12 @@ int RAND_poll(void) | |||
| 595 | * 1 byte of entropy. | 546 | * 1 byte of entropy. |
| 596 | */ | 547 | */ |
| 597 | m.dwSize = sizeof(MODULEENTRY32); | 548 | m.dwSize = sizeof(MODULEENTRY32); |
| 598 | if (good) starttime = GetTickCount(); | 549 | if (good) stoptime = GetTickCount() + MAXDELAY; |
| 599 | if (module_first(handle, &m)) | 550 | if (module_first(handle, &m)) |
| 600 | do | 551 | do |
| 601 | RAND_add(&m, m.dwSize, 9); | 552 | RAND_add(&m, m.dwSize, 9); |
| 602 | while (module_next(handle, &m) | 553 | while (module_next(handle, &m) |
| 603 | && (!good || (GetTickCount()-starttime)<MAXDELAY)); | 554 | && (GetTickCount() < stoptime)); |
| 604 | if (close_snap) | 555 | if (close_snap) |
| 605 | close_snap(handle); | 556 | close_snap(handle); |
| 606 | else | 557 | else |
| @@ -750,7 +701,7 @@ static void readscreen(void) | |||
| 750 | int y; /* y-coordinate of screen lines to grab */ | 701 | int y; /* y-coordinate of screen lines to grab */ |
| 751 | int n = 16; /* number of screen lines to grab at a time */ | 702 | int n = 16; /* number of screen lines to grab at a time */ |
| 752 | 703 | ||
| 753 | if (GetVersion() < 0x80000000 && OPENSSL_isservice()>0) | 704 | if (GetVersion() >= 0x80000000 || !OPENSSL_isservice()) |
| 754 | return; | 705 | return; |
| 755 | 706 | ||
| 756 | /* Create a screen DC and a memory DC compatible to screen DC */ | 707 | /* Create a screen DC and a memory DC compatible to screen DC */ |
diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c new file mode 100644 index 0000000000..d108353bbc --- /dev/null +++ b/src/lib/libcrypto/rand/randfile.c | |||
| @@ -0,0 +1,313 @@ | |||
| 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 | #ifdef _WIN32 | ||
| 85 | #define stat _stat | ||
| 86 | #define chmod _chmod | ||
| 87 | #define open _open | ||
| 88 | #define fdopen _fdopen | ||
| 89 | #endif | ||
| 90 | |||
| 91 | #undef BUFSIZE | ||
| 92 | #define BUFSIZE 1024 | ||
| 93 | #define RAND_DATA 1024 | ||
| 94 | |||
| 95 | #ifdef OPENSSL_SYS_VMS | ||
| 96 | /* This declaration is a nasty hack to get around vms' extension to fopen | ||
| 97 | * for passing in sharing options being disabled by our /STANDARD=ANSI89 */ | ||
| 98 | static FILE *(*const vms_fopen)(const char *, const char *, ...) = | ||
| 99 | (FILE *(*)(const char *, const char *, ...))fopen; | ||
| 100 | #define VMS_OPEN_ATTRS "shr=get,put,upd,del","ctx=bin,stm","rfm=stm","rat=none","mrs=0" | ||
| 101 | #endif | ||
| 102 | |||
| 103 | /* #define RFILE ".rnd" - defined in ../../e_os.h */ | ||
| 104 | |||
| 105 | /* Note that these functions are intended for seed files only. | ||
| 106 | * Entropy devices and EGD sockets are handled in rand_unix.c */ | ||
| 107 | |||
| 108 | int RAND_load_file(const char *file, long bytes) | ||
| 109 | { | ||
| 110 | /* If bytes >= 0, read up to 'bytes' bytes. | ||
| 111 | * if bytes == -1, read complete file. */ | ||
| 112 | |||
| 113 | MS_STATIC unsigned char buf[BUFSIZE]; | ||
| 114 | struct stat sb; | ||
| 115 | int i,ret=0,n; | ||
| 116 | FILE *in; | ||
| 117 | |||
| 118 | if (file == NULL) return(0); | ||
| 119 | |||
| 120 | if (stat(file,&sb) < 0) return(0); | ||
| 121 | RAND_add(&sb,sizeof(sb),0.0); | ||
| 122 | if (bytes == 0) return(ret); | ||
| 123 | |||
| 124 | #ifdef OPENSSL_SYS_VMS | ||
| 125 | in=vms_fopen(file,"rb",VMS_OPEN_ATTRS); | ||
| 126 | #else | ||
| 127 | in=fopen(file,"rb"); | ||
| 128 | #endif | ||
| 129 | if (in == NULL) goto err; | ||
| 130 | #if defined(S_IFBLK) && defined(S_IFCHR) | ||
| 131 | if (sb.st_mode & (S_IFBLK | S_IFCHR)) { | ||
| 132 | /* this file is a device. we don't want read an infinite number | ||
| 133 | * of bytes from a random device, nor do we want to use buffered | ||
| 134 | * I/O because we will waste system entropy. | ||
| 135 | */ | ||
| 136 | bytes = (bytes == -1) ? 2048 : bytes; /* ok, is 2048 enough? */ | ||
| 137 | setvbuf(in, NULL, _IONBF, 0); /* don't do buffered reads */ | ||
| 138 | } | ||
| 139 | #endif | ||
| 140 | for (;;) | ||
| 141 | { | ||
| 142 | if (bytes > 0) | ||
| 143 | n = (bytes < BUFSIZE)?(int)bytes:BUFSIZE; | ||
| 144 | else | ||
| 145 | n = BUFSIZE; | ||
| 146 | i=fread(buf,1,n,in); | ||
| 147 | if (i <= 0) break; | ||
| 148 | #ifdef PURIFY | ||
| 149 | RAND_add(buf,i,(double)i); | ||
| 150 | #else | ||
| 151 | /* even if n != i, use the full array */ | ||
| 152 | RAND_add(buf,n,(double)i); | ||
| 153 | #endif | ||
| 154 | ret+=i; | ||
| 155 | if (bytes > 0) | ||
| 156 | { | ||
| 157 | bytes-=n; | ||
| 158 | if (bytes <= 0) break; | ||
| 159 | } | ||
| 160 | } | ||
| 161 | fclose(in); | ||
| 162 | OPENSSL_cleanse(buf,BUFSIZE); | ||
| 163 | err: | ||
| 164 | return(ret); | ||
| 165 | } | ||
| 166 | |||
| 167 | int RAND_write_file(const char *file) | ||
| 168 | { | ||
| 169 | unsigned char buf[BUFSIZE]; | ||
| 170 | int i,ret=0,rand_err=0; | ||
| 171 | FILE *out = NULL; | ||
| 172 | int n; | ||
| 173 | struct stat sb; | ||
| 174 | |||
| 175 | i=stat(file,&sb); | ||
| 176 | if (i != -1) { | ||
| 177 | #if defined(S_IFBLK) && defined(S_IFCHR) | ||
| 178 | if (sb.st_mode & (S_IFBLK | S_IFCHR)) { | ||
| 179 | /* this file is a device. we don't write back to it. | ||
| 180 | * we "succeed" on the assumption this is some sort | ||
| 181 | * of random device. Otherwise attempting to write to | ||
| 182 | * and chmod the device causes problems. | ||
| 183 | */ | ||
| 184 | return(1); | ||
| 185 | } | ||
| 186 | #endif | ||
| 187 | } | ||
| 188 | |||
| 189 | #if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_SYS_VMS) | ||
| 190 | { | ||
| 191 | /* For some reason Win32 can't write to files created this way */ | ||
| 192 | |||
| 193 | /* chmod(..., 0600) is too late to protect the file, | ||
| 194 | * permissions should be restrictive from the start */ | ||
| 195 | int fd = open(file, O_CREAT, 0600); | ||
| 196 | if (fd != -1) | ||
| 197 | out = fdopen(fd, "wb"); | ||
| 198 | } | ||
| 199 | #endif | ||
| 200 | |||
| 201 | #ifdef OPENSSL_SYS_VMS | ||
| 202 | /* VMS NOTE: Prior versions of this routine created a _new_ | ||
| 203 | * version of the rand file for each call into this routine, then | ||
| 204 | * deleted all existing versions named ;-1, and finally renamed | ||
| 205 | * the current version as ';1'. Under concurrent usage, this | ||
| 206 | * resulted in an RMS race condition in rename() which could | ||
| 207 | * orphan files (see vms message help for RMS$_REENT). With the | ||
| 208 | * fopen() calls below, openssl/VMS now shares the top-level | ||
| 209 | * version of the rand file. Note that there may still be | ||
| 210 | * conditions where the top-level rand file is locked. If so, this | ||
| 211 | * code will then create a new version of the rand file. Without | ||
| 212 | * the delete and rename code, this can result in ascending file | ||
| 213 | * versions that stop at version 32767, and this routine will then | ||
| 214 | * return an error. The remedy for this is to recode the calling | ||
| 215 | * application to avoid concurrent use of the rand file, or | ||
| 216 | * synchronize usage at the application level. Also consider | ||
| 217 | * whether or not you NEED a persistent rand file in a concurrent | ||
| 218 | * use situation. | ||
| 219 | */ | ||
| 220 | |||
| 221 | out = vms_fopen(file,"rb+",VMS_OPEN_ATTRS); | ||
| 222 | if (out == NULL) | ||
| 223 | out = vms_fopen(file,"wb",VMS_OPEN_ATTRS); | ||
| 224 | #else | ||
| 225 | if (out == NULL) | ||
| 226 | out = fopen(file,"wb"); | ||
| 227 | #endif | ||
| 228 | if (out == NULL) goto err; | ||
| 229 | |||
| 230 | #ifndef NO_CHMOD | ||
| 231 | chmod(file,0600); | ||
| 232 | #endif | ||
| 233 | n=RAND_DATA; | ||
| 234 | for (;;) | ||
| 235 | { | ||
| 236 | i=(n > BUFSIZE)?BUFSIZE:n; | ||
| 237 | n-=BUFSIZE; | ||
| 238 | if (RAND_bytes(buf,i) <= 0) | ||
| 239 | rand_err=1; | ||
| 240 | i=fwrite(buf,1,i,out); | ||
| 241 | if (i <= 0) | ||
| 242 | { | ||
| 243 | ret=0; | ||
| 244 | break; | ||
| 245 | } | ||
| 246 | ret+=i; | ||
| 247 | if (n <= 0) break; | ||
| 248 | } | ||
| 249 | |||
| 250 | fclose(out); | ||
| 251 | OPENSSL_cleanse(buf,BUFSIZE); | ||
| 252 | err: | ||
| 253 | return (rand_err ? -1 : ret); | ||
| 254 | } | ||
| 255 | |||
| 256 | const char *RAND_file_name(char *buf, size_t size) | ||
| 257 | { | ||
| 258 | char *s=NULL; | ||
| 259 | int ok = 0; | ||
| 260 | #ifdef __OpenBSD__ | ||
| 261 | struct stat sb; | ||
| 262 | #endif | ||
| 263 | |||
| 264 | if (OPENSSL_issetugid() == 0) | ||
| 265 | s=getenv("RANDFILE"); | ||
| 266 | if (s != NULL && *s && strlen(s) + 1 < size) | ||
| 267 | { | ||
| 268 | if (BUF_strlcpy(buf,s,size) >= size) | ||
| 269 | return NULL; | ||
| 270 | } | ||
| 271 | else | ||
| 272 | { | ||
| 273 | if (OPENSSL_issetugid() == 0) | ||
| 274 | s=getenv("HOME"); | ||
| 275 | #ifdef DEFAULT_HOME | ||
| 276 | if (s == NULL) | ||
| 277 | { | ||
| 278 | s = DEFAULT_HOME; | ||
| 279 | } | ||
| 280 | #endif | ||
| 281 | if (s && *s && strlen(s)+strlen(RFILE)+2 < size) | ||
| 282 | { | ||
| 283 | BUF_strlcpy(buf,s,size); | ||
| 284 | #ifndef OPENSSL_SYS_VMS | ||
| 285 | BUF_strlcat(buf,"/",size); | ||
| 286 | #endif | ||
| 287 | BUF_strlcat(buf,RFILE,size); | ||
| 288 | ok = 1; | ||
| 289 | } | ||
| 290 | else | ||
| 291 | buf[0] = '\0'; /* no file name */ | ||
| 292 | } | ||
| 293 | |||
| 294 | #ifdef __OpenBSD__ | ||
| 295 | /* given that all random loads just fail if the file can't be | ||
| 296 | * seen on a stat, we stat the file we're returning, if it | ||
| 297 | * fails, use /dev/arandom instead. this allows the user to | ||
| 298 | * use their own source for good random data, but defaults | ||
| 299 | * to something hopefully decent if that isn't available. | ||
| 300 | */ | ||
| 301 | |||
| 302 | if (!ok) | ||
| 303 | if (BUF_strlcpy(buf,"/dev/arandom",size) >= size) { | ||
| 304 | return(NULL); | ||
| 305 | } | ||
| 306 | if (stat(buf,&sb) == -1) | ||
| 307 | if (BUF_strlcpy(buf,"/dev/arandom",size) >= size) { | ||
| 308 | return(NULL); | ||
| 309 | } | ||
| 310 | |||
| 311 | #endif | ||
| 312 | return(buf); | ||
| 313 | } | ||
