summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/rand
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libcrypto/rand')
-rw-r--r--src/lib/libcrypto/rand/Makefile.ssl194
-rw-r--r--src/lib/libcrypto/rand/md_rand.c4
-rw-r--r--src/lib/libcrypto/rand/rand.h131
-rw-r--r--src/lib/libcrypto/rand/rand_egd.c8
-rw-r--r--src/lib/libcrypto/rand/rand_err.c95
-rw-r--r--src/lib/libcrypto/rand/rand_lib.c166
-rw-r--r--src/lib/libcrypto/rand/rand_unix.c28
-rw-r--r--src/lib/libcrypto/rand/rand_win.c84
-rw-r--r--src/lib/libcrypto/rand/randfile.c273
-rw-r--r--src/lib/libcrypto/rand/randtest.c4
10 files changed, 914 insertions, 73 deletions
diff --git a/src/lib/libcrypto/rand/Makefile.ssl b/src/lib/libcrypto/rand/Makefile.ssl
new file mode 100644
index 0000000000..73b5f568e8
--- /dev/null
+++ b/src/lib/libcrypto/rand/Makefile.ssl
@@ -0,0 +1,194 @@
1#
2# SSLeay/crypto/rand/Makefile
3#
4
5DIR= rand
6TOP= ../..
7CC= cc
8INCLUDES=
9CFLAG=-g
10INSTALL_PREFIX=
11OPENSSLDIR= /usr/local/ssl
12INSTALLTOP=/usr/local/ssl
13MAKE= make -f Makefile.ssl
14MAKEDEPPROG= makedepend
15MAKEDEPEND= $(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)
16MAKEFILE= Makefile.ssl
17AR= ar r
18
19CFLAGS= $(INCLUDES) $(CFLAG)
20
21GENERAL=Makefile
22TEST= randtest.c
23APPS=
24
25LIB=$(TOP)/libcrypto.a
26LIBSRC=md_rand.c randfile.c rand_lib.c rand_err.c rand_egd.c \
27 rand_win.c rand_unix.c rand_os2.c
28LIBOBJ=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
31SRC= $(LIBSRC)
32
33EXHEADER= rand.h
34HEADER= $(EXHEADER)
35
36ALL= $(GENERAL) $(SRC) $(HEADER)
37
38top:
39 (cd ../..; $(MAKE) DIRS=crypto SDIRS=$(DIR) sub_all)
40
41all: lib
42
43lib: $(LIBOBJ)
44 $(AR) $(LIB) $(LIBOBJ)
45 $(RANLIB) $(LIB) || echo Never mind.
46 @touch lib
47
48files:
49 $(PERL) $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
50
51links:
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
57install:
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
64tags:
65 ctags $(SRC)
66
67tests:
68
69lint:
70 lint -DLINT $(INCLUDES) $(SRC)>fluff
71
72depend:
73 $(MAKEDEPEND) $(CFLAG) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
74
75dclean:
76 $(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new
77 mv -f Makefile.new $(MAKEFILE)
78
79clean:
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
84md_rand.o: ../../e_os.h ../../include/openssl/aes.h
85md_rand.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
86md_rand.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
87md_rand.o: ../../include/openssl/cast.h ../../include/openssl/crypto.h
88md_rand.o: ../../include/openssl/des.h ../../include/openssl/des_old.h
89md_rand.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
90md_rand.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
91md_rand.o: ../../include/openssl/evp.h ../../include/openssl/idea.h
92md_rand.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h
93md_rand.o: ../../include/openssl/md4.h ../../include/openssl/md5.h
94md_rand.o: ../../include/openssl/mdc2.h ../../include/openssl/obj_mac.h
95md_rand.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
96md_rand.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
97md_rand.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
98md_rand.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
99md_rand.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
100md_rand.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
101md_rand.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
102md_rand.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
103md_rand.o: md_rand.c rand_lcl.h
104rand_egd.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
105rand_egd.o: ../../include/openssl/ossl_typ.h ../../include/openssl/rand.h
106rand_egd.o: rand_egd.c
107rand_err.o: ../../include/openssl/bio.h ../../include/openssl/crypto.h
108rand_err.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
109rand_err.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
110rand_err.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
111rand_err.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
112rand_err.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
113rand_err.o: rand_err.c
114rand_lib.o: ../../e_os.h ../../include/openssl/asn1.h
115rand_lib.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
116rand_lib.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
117rand_lib.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h
118rand_lib.o: ../../include/openssl/e_os2.h ../../include/openssl/engine.h
119rand_lib.o: ../../include/openssl/err.h ../../include/openssl/lhash.h
120rand_lib.o: ../../include/openssl/opensslconf.h
121rand_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
122rand_lib.o: ../../include/openssl/rand.h ../../include/openssl/rsa.h
123rand_lib.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
124rand_lib.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h
125rand_lib.o: ../cryptlib.h rand_lib.c
126rand_os2.o: ../../e_os.h ../../include/openssl/aes.h
127rand_os2.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
128rand_os2.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
129rand_os2.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
130rand_os2.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
131rand_os2.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
132rand_os2.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
133rand_os2.o: ../../include/openssl/err.h ../../include/openssl/evp.h
134rand_os2.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
135rand_os2.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
136rand_os2.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
137rand_os2.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
138rand_os2.o: ../../include/openssl/opensslconf.h
139rand_os2.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
140rand_os2.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
141rand_os2.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
142rand_os2.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
143rand_os2.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
144rand_os2.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
145rand_os2.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
146rand_os2.o: ../cryptlib.h rand_lcl.h rand_os2.c
147rand_unix.o: ../../e_os.h ../../include/openssl/aes.h
148rand_unix.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
149rand_unix.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
150rand_unix.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
151rand_unix.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
152rand_unix.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
153rand_unix.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
154rand_unix.o: ../../include/openssl/err.h ../../include/openssl/evp.h
155rand_unix.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
156rand_unix.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
157rand_unix.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
158rand_unix.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
159rand_unix.o: ../../include/openssl/opensslconf.h
160rand_unix.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
161rand_unix.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
162rand_unix.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
163rand_unix.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
164rand_unix.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
165rand_unix.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
166rand_unix.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
167rand_unix.o: ../cryptlib.h rand_lcl.h rand_unix.c
168rand_win.o: ../../e_os.h ../../include/openssl/aes.h
169rand_win.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
170rand_win.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h
171rand_win.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h
172rand_win.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
173rand_win.o: ../../include/openssl/des_old.h ../../include/openssl/dh.h
174rand_win.o: ../../include/openssl/dsa.h ../../include/openssl/e_os2.h
175rand_win.o: ../../include/openssl/err.h ../../include/openssl/evp.h
176rand_win.o: ../../include/openssl/idea.h ../../include/openssl/lhash.h
177rand_win.o: ../../include/openssl/md2.h ../../include/openssl/md4.h
178rand_win.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h
179rand_win.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
180rand_win.o: ../../include/openssl/opensslconf.h
181rand_win.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
182rand_win.o: ../../include/openssl/rand.h ../../include/openssl/rc2.h
183rand_win.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h
184rand_win.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h
185rand_win.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
186rand_win.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
187rand_win.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h
188rand_win.o: ../cryptlib.h rand_lcl.h rand_win.c
189randfile.o: ../../e_os.h ../../include/openssl/crypto.h
190randfile.o: ../../include/openssl/e_os2.h ../../include/openssl/opensslconf.h
191randfile.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
192randfile.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h
193randfile.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
194randfile.o: randfile.c
diff --git a/src/lib/libcrypto/rand/md_rand.c b/src/lib/libcrypto/rand/md_rand.c
index eeffc0df4c..a00ed70718 100644
--- a/src/lib/libcrypto/rand/md_rand.c
+++ b/src/lib/libcrypto/rand/md_rand.c
@@ -177,10 +177,10 @@ RAND_METHOD *RAND_SSLeay(void)
177 177
178static void ssleay_rand_cleanup(void) 178static void ssleay_rand_cleanup(void)
179 { 179 {
180 OPENSSL_cleanse(state,sizeof(state)); 180 memset(state,0,sizeof(state));
181 state_num=0; 181 state_num=0;
182 state_index=0; 182 state_index=0;
183 OPENSSL_cleanse(md,MD_DIGEST_LENGTH); 183 memset(md,0,MD_DIGEST_LENGTH);
184 md_count[0]=0; 184 md_count[0]=0;
185 md_count[1]=0; 185 md_count[1]=0;
186 entropy=0; 186 entropy=0;
diff --git a/src/lib/libcrypto/rand/rand.h b/src/lib/libcrypto/rand/rand.h
new file mode 100644
index 0000000000..66e39991ec
--- /dev/null
+++ b/src/lib/libcrypto/rand/rand.h
@@ -0,0 +1,131 @@
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
71extern "C" {
72#endif
73
74typedef struct rand_meth_st
75 {
76 void (*seed)(const void *buf, int num);
77 int (*bytes)(unsigned char *buf, int num);
78 void (*cleanup)(void);
79 void (*add)(const void *buf, int num, double entropy);
80 int (*pseudorand)(unsigned char *buf, int num);
81 int (*status)(void);
82 } RAND_METHOD;
83
84#ifdef BN_DEBUG
85extern int rand_predictable;
86#endif
87
88int RAND_set_rand_method(const RAND_METHOD *meth);
89const RAND_METHOD *RAND_get_rand_method(void);
90int RAND_set_rand_engine(ENGINE *engine);
91RAND_METHOD *RAND_SSLeay(void);
92void RAND_cleanup(void );
93int RAND_bytes(unsigned char *buf,int num);
94int RAND_pseudo_bytes(unsigned char *buf,int num);
95void RAND_seed(const void *buf,int num);
96void RAND_add(const void *buf,int num,double entropy);
97int RAND_load_file(const char *file,long max_bytes);
98int RAND_write_file(const char *file);
99const char *RAND_file_name(char *file,size_t num);
100int RAND_status(void);
101int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes);
102int RAND_egd(const char *path);
103int RAND_egd_bytes(const char *path,int bytes);
104int RAND_poll(void);
105
106#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
107
108void RAND_screen(void);
109int RAND_event(UINT, WPARAM, LPARAM);
110
111#endif
112
113/* BEGIN ERROR CODES */
114/* The following lines are auto generated by the script mkerr.pl. Any changes
115 * made after this point may be overwritten when the script is next run.
116 */
117void ERR_load_RAND_strings(void);
118
119/* Error codes for the RAND functions. */
120
121/* Function codes. */
122#define RAND_F_RAND_GET_RAND_METHOD 101
123#define RAND_F_SSLEAY_RAND_BYTES 100
124
125/* Reason codes. */
126#define RAND_R_PRNG_NOT_SEEDED 100
127
128#ifdef __cplusplus
129}
130#endif
131#endif
diff --git a/src/lib/libcrypto/rand/rand_egd.c b/src/lib/libcrypto/rand/rand_egd.c
index 1f168221e3..96019c07a6 100644
--- a/src/lib/libcrypto/rand/rand_egd.c
+++ b/src/lib/libcrypto/rand/rand_egd.c
@@ -94,7 +94,7 @@
94 * RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255. 94 * RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255.
95 */ 95 */
96 96
97#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_VXWORKS) 97#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(__DJGPP__)
98int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes) 98int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
99 { 99 {
100 return(-1); 100 return(-1);
@@ -114,7 +114,7 @@ int RAND_egd_bytes(const char *path,int bytes)
114#include <sys/types.h> 114#include <sys/types.h>
115#include <sys/socket.h> 115#include <sys/socket.h>
116#ifndef NO_SYS_UN_H 116#ifndef NO_SYS_UN_H
117# ifdef OPENSSL_SYS_VXWORKS 117# ifdef OPENSSL_SYS_VSWORKS
118# include <streams/un.h> 118# include <streams/un.h>
119# else 119# else
120# include <sys/un.h> 120# include <sys/un.h>
@@ -143,9 +143,9 @@ int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
143 143
144 memset(&addr, 0, sizeof(addr)); 144 memset(&addr, 0, sizeof(addr));
145 addr.sun_family = AF_UNIX; 145 addr.sun_family = AF_UNIX;
146 if (strlen(path) >= sizeof(addr.sun_path)) 146 if (strlen(path) > sizeof(addr.sun_path))
147 return (-1); 147 return (-1);
148 strcpy(addr.sun_path,path); 148 strlcpy(addr.sun_path,path,sizeof addr.sun_path);
149 len = offsetof(struct sockaddr_un, sun_path) + strlen(path); 149 len = offsetof(struct sockaddr_un, sun_path) + strlen(path);
150 fd = socket(AF_UNIX, SOCK_STREAM, 0); 150 fd = socket(AF_UNIX, SOCK_STREAM, 0);
151 if (fd == -1) return (-1); 151 if (fd == -1) 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..b77267e213
--- /dev/null
+++ b/src/lib/libcrypto/rand/rand_err.c
@@ -0,0 +1,95 @@
1/* crypto/rand/rand_err.c */
2/* ====================================================================
3 * Copyright (c) 1999 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
67static ERR_STRING_DATA RAND_str_functs[]=
68 {
69{ERR_PACK(0,RAND_F_RAND_GET_RAND_METHOD,0), "RAND_get_rand_method"},
70{ERR_PACK(0,RAND_F_SSLEAY_RAND_BYTES,0), "SSLEAY_RAND_BYTES"},
71{0,NULL}
72 };
73
74static ERR_STRING_DATA RAND_str_reasons[]=
75 {
76{RAND_R_PRNG_NOT_SEEDED ,"PRNG not seeded"},
77{0,NULL}
78 };
79
80#endif
81
82void ERR_load_RAND_strings(void)
83 {
84 static int init=1;
85
86 if (init)
87 {
88 init=0;
89#ifndef OPENSSL_NO_ERR
90 ERR_load_strings(ERR_LIB_RAND,RAND_str_functs);
91 ERR_load_strings(ERR_LIB_RAND,RAND_str_reasons);
92#endif
93
94 }
95 }
diff --git a/src/lib/libcrypto/rand/rand_lib.c b/src/lib/libcrypto/rand/rand_lib.c
new file mode 100644
index 0000000000..5cf5dc1188
--- /dev/null
+++ b/src/lib/libcrypto/rand/rand_lib.c
@@ -0,0 +1,166 @@
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 <openssl/engine.h>
64
65/* non-NULL if default_RAND_meth is ENGINE-provided */
66static ENGINE *funct_ref =NULL;
67static const RAND_METHOD *default_RAND_meth = NULL;
68
69int RAND_set_rand_method(const RAND_METHOD *meth)
70 {
71 if(funct_ref)
72 {
73 ENGINE_finish(funct_ref);
74 funct_ref = NULL;
75 }
76 default_RAND_meth = meth;
77 return 1;
78 }
79
80const RAND_METHOD *RAND_get_rand_method(void)
81 {
82 if (!default_RAND_meth)
83 {
84 ENGINE *e = ENGINE_get_default_RAND();
85 if(e)
86 {
87 default_RAND_meth = ENGINE_get_RAND(e);
88 if(!default_RAND_meth)
89 {
90 ENGINE_finish(e);
91 e = NULL;
92 }
93 }
94 if(e)
95 funct_ref = e;
96 else
97 default_RAND_meth = RAND_SSLeay();
98 }
99 return default_RAND_meth;
100 }
101
102int RAND_set_rand_engine(ENGINE *engine)
103 {
104 const RAND_METHOD *tmp_meth = NULL;
105 if(engine)
106 {
107 if(!ENGINE_init(engine))
108 return 0;
109 tmp_meth = ENGINE_get_RAND(engine);
110 if(!tmp_meth)
111 {
112 ENGINE_finish(engine);
113 return 0;
114 }
115 }
116 /* This function releases any prior ENGINE so call it first */
117 RAND_set_rand_method(tmp_meth);
118 funct_ref = engine;
119 return 1;
120 }
121
122void RAND_cleanup(void)
123 {
124 const RAND_METHOD *meth = RAND_get_rand_method();
125 if (meth && meth->cleanup)
126 meth->cleanup();
127 RAND_set_rand_method(NULL);
128 }
129
130void RAND_seed(const void *buf, int num)
131 {
132 const RAND_METHOD *meth = RAND_get_rand_method();
133 if (meth && meth->seed)
134 meth->seed(buf,num);
135 }
136
137void RAND_add(const void *buf, int num, double entropy)
138 {
139 const RAND_METHOD *meth = RAND_get_rand_method();
140 if (meth && meth->add)
141 meth->add(buf,num,entropy);
142 }
143
144int RAND_bytes(unsigned char *buf, int num)
145 {
146 const RAND_METHOD *meth = RAND_get_rand_method();
147 if (meth && meth->bytes)
148 return meth->bytes(buf,num);
149 return(-1);
150 }
151
152int RAND_pseudo_bytes(unsigned char *buf, int num)
153 {
154 const RAND_METHOD *meth = RAND_get_rand_method();
155 if (meth && meth->pseudorand)
156 return meth->pseudorand(buf,num);
157 return(-1);
158 }
159
160int RAND_status(void)
161 {
162 const RAND_METHOD *meth = RAND_get_rand_method();
163 if (meth && meth->status)
164 return meth->status();
165 return 0;
166 }
diff --git a/src/lib/libcrypto/rand/rand_unix.c b/src/lib/libcrypto/rand/rand_unix.c
index a776e52243..fa2bab57c6 100644
--- a/src/lib/libcrypto/rand/rand_unix.c
+++ b/src/lib/libcrypto/rand/rand_unix.c
@@ -115,7 +115,7 @@
115#include <openssl/rand.h> 115#include <openssl/rand.h>
116#include "rand_lcl.h" 116#include "rand_lcl.h"
117 117
118#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_VXWORKS)) 118#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_OS2))
119 119
120#include <sys/types.h> 120#include <sys/types.h>
121#include <sys/time.h> 121#include <sys/time.h>
@@ -124,6 +124,24 @@
124#include <unistd.h> 124#include <unistd.h>
125#include <time.h> 125#include <time.h>
126 126
127#ifdef __OpenBSD__
128int RAND_poll(void)
129{
130 u_int32_t rnd = 0, i;
131 unsigned char buf[ENTROPY_NEEDED];
132
133 for (i = 0; i < sizeof(buf); i++) {
134 if (i % 4 == 0)
135 rnd = arc4random();
136 buf[i] = rnd;
137 rnd >>= 8;
138 }
139 RAND_add(buf, sizeof(buf), ENTROPY_NEEDED);
140 memset(buf, 0, sizeof(buf));
141
142 return 1;
143}
144#else
127int RAND_poll(void) 145int RAND_poll(void)
128{ 146{
129 unsigned long l; 147 unsigned long l;
@@ -215,7 +233,7 @@ int RAND_poll(void)
215 if (n > 0) 233 if (n > 0)
216 { 234 {
217 RAND_add(tmpbuf,sizeof tmpbuf,n); 235 RAND_add(tmpbuf,sizeof tmpbuf,n);
218 OPENSSL_cleanse(tmpbuf,n); 236 memset(tmpbuf,0,n);
219 } 237 }
220#endif 238#endif
221 239
@@ -236,10 +254,4 @@ int RAND_poll(void)
236} 254}
237 255
238#endif 256#endif
239
240#if defined(OPENSSL_SYS_VXWORKS)
241int RAND_poll(void)
242{
243 return 0;
244}
245#endif 257#endif
diff --git a/src/lib/libcrypto/rand/rand_win.c b/src/lib/libcrypto/rand/rand_win.c
index 113b58678f..c1b955b06f 100644
--- a/src/lib/libcrypto/rand/rand_win.c
+++ b/src/lib/libcrypto/rand/rand_win.c
@@ -125,7 +125,7 @@
125 * http://developer.intel.com/design/security/rng/redist_license.htm 125 * http://developer.intel.com/design/security/rng/redist_license.htm
126 */ 126 */
127#define PROV_INTEL_SEC 22 127#define PROV_INTEL_SEC 22
128#define INTEL_DEF_PROV TEXT("Intel Hardware Cryptographic Service Provider") 128#define INTEL_DEF_PROV "Intel Hardware Cryptographic Service Provider"
129 129
130static void readtimer(void); 130static void readtimer(void);
131static void readscreen(void); 131static void readscreen(void);
@@ -170,9 +170,7 @@ typedef BOOL (WINAPI *THREAD32)(HANDLE, LPTHREADENTRY32);
170typedef BOOL (WINAPI *MODULE32)(HANDLE, LPMODULEENTRY32); 170typedef BOOL (WINAPI *MODULE32)(HANDLE, LPMODULEENTRY32);
171 171
172#include <lmcons.h> 172#include <lmcons.h>
173#ifndef OPENSSL_SYS_WINCE
174#include <lmstats.h> 173#include <lmstats.h>
175#endif
176#if 1 /* The NET API is Unicode only. It requires the use of the UNICODE 174#if 1 /* The NET API is Unicode only. It requires the use of the UNICODE
177 * macro. When UNICODE is defined LPTSTR becomes LPWSTR. LMSTR was 175 * macro. When UNICODE is defined LPTSTR becomes LPWSTR. LMSTR was
178 * was added to the Platform SDK to allow the NET API to be used in 176 * was added to the Platform SDK to allow the NET API to be used in
@@ -211,32 +209,20 @@ int RAND_poll(void)
211 osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO) ; 209 osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO) ;
212 GetVersionEx( &osverinfo ) ; 210 GetVersionEx( &osverinfo ) ;
213 211
214#if defined(OPENSSL_SYS_WINCE) && WCEPLATFORM!=MS_HPC_PRO
215 /* poll the CryptoAPI PRNG */
216 /* The CryptoAPI returns sizeof(buf) bytes of randomness */
217 if (CryptAcquireContext(&hProvider, 0, 0, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
218 {
219 if (CryptGenRandom(hProvider, sizeof(buf), buf))
220 RAND_add(buf, sizeof(buf), sizeof(buf));
221 CryptReleaseContext(hProvider, 0);
222 }
223#endif
224
225 /* load functions dynamically - not available on all systems */ 212 /* load functions dynamically - not available on all systems */
226 advapi = LoadLibrary(TEXT("ADVAPI32.DLL")); 213 advapi = LoadLibrary("ADVAPI32.DLL");
227 kernel = LoadLibrary(TEXT("KERNEL32.DLL")); 214 kernel = LoadLibrary("KERNEL32.DLL");
228 user = LoadLibrary(TEXT("USER32.DLL")); 215 user = LoadLibrary("USER32.DLL");
229 netapi = LoadLibrary(TEXT("NETAPI32.DLL")); 216 netapi = LoadLibrary("NETAPI32.DLL");
230 217
231#ifndef OPENSSL_SYS_WINCE
232#if 1 /* There was previously a problem with NETSTATGET. Currently, this 218#if 1 /* There was previously a problem with NETSTATGET. Currently, this
233 * section is still experimental, but if all goes well, this conditional 219 * section is still experimental, but if all goes well, this conditional
234 * will be removed 220 * will be removed
235 */ 221 */
236 if (netapi) 222 if (netapi)
237 { 223 {
238 netstatget = (NETSTATGET) GetProcAddress(netapi,TEXT("NetStatisticsGet")); 224 netstatget = (NETSTATGET) GetProcAddress(netapi,"NetStatisticsGet");
239 netfree = (NETFREE) GetProcAddress(netapi,TEXT("NetApiBufferFree")); 225 netfree = (NETFREE) GetProcAddress(netapi,"NetApiBufferFree");
240 } 226 }
241 227
242 if (netstatget && netfree) 228 if (netstatget && netfree)
@@ -263,9 +249,7 @@ int RAND_poll(void)
263 if (netapi) 249 if (netapi)
264 FreeLibrary(netapi); 250 FreeLibrary(netapi);
265#endif /* 1 */ 251#endif /* 1 */
266#endif /* !OPENSSL_SYS_WINCE */
267 252
268#ifndef OPENSSL_SYS_WINCE
269 /* It appears like this can cause an exception deep within ADVAPI32.DLL 253 /* It appears like this can cause an exception deep within ADVAPI32.DLL
270 * at random times on Windows 2000. Reported by Jeffrey Altman. 254 * at random times on Windows 2000. Reported by Jeffrey Altman.
271 * Only use it on NT. 255 * Only use it on NT.
@@ -296,40 +280,30 @@ int RAND_poll(void)
296 bufsz += 8192; 280 bufsz += 8192;
297 281
298 length = bufsz; 282 length = bufsz;
299 rc = RegQueryValueEx(HKEY_PERFORMANCE_DATA, TEXT("Global"), 283 rc = RegQueryValueEx(HKEY_PERFORMANCE_DATA, "Global",
300 NULL, NULL, buf, &length); 284 NULL, NULL, buf, &length);
301 } 285 }
302 if (rc == ERROR_SUCCESS) 286 if (rc == ERROR_SUCCESS)
303 { 287 {
304 /* For entropy count assume only least significant 288 /* For entropy count assume only least significant
305 * byte of each DWORD is random. 289 * byte of each DWORD is random.
306 */ 290 */
307 RAND_add(&length, sizeof(length), 0); 291 RAND_add(&length, sizeof(length), 0);
308 RAND_add(buf, length, length / 4.0); 292 RAND_add(buf, length, length / 4.0);
309
310 /* Close the Registry Key to allow Windows to cleanup/close
311 * the open handle
312 * Note: The 'HKEY_PERFORMANCE_DATA' key is implicitly opened
313 * when the RegQueryValueEx above is done. However, if
314 * it is not explicitly closed, it can cause disk
315 * partition manipulation problems.
316 */
317 RegCloseKey(HKEY_PERFORMANCE_DATA);
318 } 293 }
319 if (buf) 294 if (buf)
320 free(buf); 295 free(buf);
321 } 296 }
322#endif 297#endif
323#endif /* !OPENSSL_SYS_WINCE */
324 298
325 if (advapi) 299 if (advapi)
326 { 300 {
327 acquire = (CRYPTACQUIRECONTEXT) GetProcAddress(advapi, 301 acquire = (CRYPTACQUIRECONTEXT) GetProcAddress(advapi,
328 TEXT("CryptAcquireContextA")); 302 "CryptAcquireContextA");
329 gen = (CRYPTGENRANDOM) GetProcAddress(advapi, 303 gen = (CRYPTGENRANDOM) GetProcAddress(advapi,
330 TEXT("CryptGenRandom")); 304 "CryptGenRandom");
331 release = (CRYPTRELEASECONTEXT) GetProcAddress(advapi, 305 release = (CRYPTRELEASECONTEXT) GetProcAddress(advapi,
332 TEXT("CryptReleaseContext")); 306 "CryptReleaseContext");
333 } 307 }
334 308
335 if (acquire && gen && release) 309 if (acquire && gen && release)
@@ -383,9 +357,9 @@ int RAND_poll(void)
383 GETFOREGROUNDWINDOW win; 357 GETFOREGROUNDWINDOW win;
384 GETQUEUESTATUS queue; 358 GETQUEUESTATUS queue;
385 359
386 win = (GETFOREGROUNDWINDOW) GetProcAddress(user, TEXT("GetForegroundWindow")); 360 win = (GETFOREGROUNDWINDOW) GetProcAddress(user, "GetForegroundWindow");
387 cursor = (GETCURSORINFO) GetProcAddress(user, TEXT("GetCursorInfo")); 361 cursor = (GETCURSORINFO) GetProcAddress(user, "GetCursorInfo");
388 queue = (GETQUEUESTATUS) GetProcAddress(user, TEXT("GetQueueStatus")); 362 queue = (GETQUEUESTATUS) GetProcAddress(user, "GetQueueStatus");
389 363
390 if (win) 364 if (win)
391 { 365 {
@@ -456,17 +430,17 @@ int RAND_poll(void)
456 MODULEENTRY32 m; 430 MODULEENTRY32 m;
457 431
458 snap = (CREATETOOLHELP32SNAPSHOT) 432 snap = (CREATETOOLHELP32SNAPSHOT)
459 GetProcAddress(kernel, TEXT("CreateToolhelp32Snapshot")); 433 GetProcAddress(kernel, "CreateToolhelp32Snapshot");
460 heap_first = (HEAP32FIRST) GetProcAddress(kernel, TEXT("Heap32First")); 434 heap_first = (HEAP32FIRST) GetProcAddress(kernel, "Heap32First");
461 heap_next = (HEAP32NEXT) GetProcAddress(kernel, TEXT("Heap32Next")); 435 heap_next = (HEAP32NEXT) GetProcAddress(kernel, "Heap32Next");
462 heaplist_first = (HEAP32LIST) GetProcAddress(kernel, TEXT("Heap32ListFirst")); 436 heaplist_first = (HEAP32LIST) GetProcAddress(kernel, "Heap32ListFirst");
463 heaplist_next = (HEAP32LIST) GetProcAddress(kernel, TEXT("Heap32ListNext")); 437 heaplist_next = (HEAP32LIST) GetProcAddress(kernel, "Heap32ListNext");
464 process_first = (PROCESS32) GetProcAddress(kernel, TEXT("Process32First")); 438 process_first = (PROCESS32) GetProcAddress(kernel, "Process32First");
465 process_next = (PROCESS32) GetProcAddress(kernel, TEXT("Process32Next")); 439 process_next = (PROCESS32) GetProcAddress(kernel, "Process32Next");
466 thread_first = (THREAD32) GetProcAddress(kernel, TEXT("Thread32First")); 440 thread_first = (THREAD32) GetProcAddress(kernel, "Thread32First");
467 thread_next = (THREAD32) GetProcAddress(kernel, TEXT("Thread32Next")); 441 thread_next = (THREAD32) GetProcAddress(kernel, "Thread32Next");
468 module_first = (MODULE32) GetProcAddress(kernel, TEXT("Module32First")); 442 module_first = (MODULE32) GetProcAddress(kernel, "Module32First");
469 module_next = (MODULE32) GetProcAddress(kernel, TEXT("Module32Next")); 443 module_next = (MODULE32) GetProcAddress(kernel, "Module32Next");
470 444
471 if (snap && heap_first && heap_next && heaplist_first && 445 if (snap && heap_first && heap_next && heaplist_first &&
472 heaplist_next && process_first && process_next && 446 heaplist_next && process_first && process_next &&
@@ -601,7 +575,7 @@ static void readtimer(void)
601 DWORD w; 575 DWORD w;
602 LARGE_INTEGER l; 576 LARGE_INTEGER l;
603 static int have_perfc = 1; 577 static int have_perfc = 1;
604#if defined(_MSC_VER) && !defined(OPENSSL_SYS_WINCE) 578#ifdef _MSC_VER
605 static int have_tsc = 1; 579 static int have_tsc = 1;
606 DWORD cyclecount; 580 DWORD cyclecount;
607 581
@@ -654,7 +628,6 @@ static void readtimer(void)
654 628
655static void readscreen(void) 629static void readscreen(void)
656{ 630{
657#ifndef OPENSSL_SYS_WINCE
658 HDC hScrDC; /* screen DC */ 631 HDC hScrDC; /* screen DC */
659 HDC hMemDC; /* memory DC */ 632 HDC hMemDC; /* memory DC */
660 HBITMAP hBitmap; /* handle for our bitmap */ 633 HBITMAP hBitmap; /* handle for our bitmap */
@@ -668,7 +641,7 @@ static void readscreen(void)
668 int n = 16; /* number of screen lines to grab at a time */ 641 int n = 16; /* number of screen lines to grab at a time */
669 642
670 /* Create a screen DC and a memory DC compatible to screen DC */ 643 /* Create a screen DC and a memory DC compatible to screen DC */
671 hScrDC = CreateDC(TEXT("DISPLAY"), NULL, NULL, NULL); 644 hScrDC = CreateDC("DISPLAY", NULL, NULL, NULL);
672 hMemDC = CreateCompatibleDC(hScrDC); 645 hMemDC = CreateCompatibleDC(hScrDC);
673 646
674 /* Get screen resolution */ 647 /* Get screen resolution */
@@ -715,7 +688,6 @@ static void readscreen(void)
715 DeleteObject(hBitmap); 688 DeleteObject(hBitmap);
716 DeleteDC(hMemDC); 689 DeleteDC(hMemDC);
717 DeleteDC(hScrDC); 690 DeleteDC(hScrDC);
718#endif /* !OPENSSL_SYS_WINCE */
719} 691}
720 692
721#endif 693#endif
diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c
new file mode 100644
index 0000000000..311dd27a7b
--- /dev/null
+++ b/src/lib/libcrypto/rand/randfile.c
@@ -0,0 +1,273 @@
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#include <errno.h>
60#include <stdio.h>
61#include <stdlib.h>
62#include <string.h>
63
64#include "e_os.h"
65#include <openssl/crypto.h>
66#include <openssl/rand.h>
67
68#ifdef OPENSSL_SYS_VMS
69#include <unixio.h>
70#endif
71#ifndef NO_SYS_TYPES_H
72# include <sys/types.h>
73#endif
74#ifdef MAC_OS_pre_X
75# include <stat.h>
76#else
77# include <sys/stat.h>
78#endif
79
80#undef BUFSIZE
81#define BUFSIZE 1024
82#define RAND_DATA 1024
83
84/* #define RFILE ".rnd" - defined in ../../e_os.h */
85
86/* Note that these functions are intended for seed files only.
87 * Entropy devices and EGD sockets are handled in rand_unix.c */
88
89int RAND_load_file(const char *file, long bytes)
90 {
91 /* If bytes >= 0, read up to 'bytes' bytes.
92 * if bytes == -1, read complete file. */
93
94 MS_STATIC unsigned char buf[BUFSIZE];
95 struct stat sb;
96 int i,ret=0,n;
97 FILE *in;
98
99 if (file == NULL) return(0);
100
101 i=stat(file,&sb);
102 /* If the state fails, put some crap in anyway */
103 RAND_add(&sb,sizeof(sb),0);
104 if (i < 0) return(0);
105 if (bytes == 0) return(ret);
106
107 in=fopen(file,"rb");
108 if (in == NULL) goto err;
109 if (sb.st_mode & (S_IFBLK | S_IFCHR)) {
110 /* this file is a device. we don't want read an infinite number
111 * of bytes from a random device, nor do we want to use buffered
112 * I/O because we will waste system entropy.
113 */
114 bytes = (bytes == -1) ? 2048 : bytes; /* ok, is 2048 enough? */
115 setvbuf(in, NULL, _IONBF, 0); /* don't do buffered reads */
116 }
117 for (;;)
118 {
119 if (bytes > 0)
120 n = (bytes < BUFSIZE)?(int)bytes:BUFSIZE;
121 else
122 n = BUFSIZE;
123 i=fread(buf,1,n,in);
124 if (i <= 0) break;
125 /* even if n != i, use the full array */
126 RAND_add(buf,n,i);
127 ret+=i;
128 if (bytes > 0)
129 {
130 bytes-=n;
131 if (bytes <= 0) break;
132 }
133 }
134 fclose(in);
135 memset(buf,0,BUFSIZE);
136err:
137 return(ret);
138 }
139
140int RAND_write_file(const char *file)
141 {
142 unsigned char buf[BUFSIZE];
143 int i,ret=0,rand_err=0;
144 FILE *out = NULL;
145 int n;
146 struct stat sb;
147
148 i=stat(file,&sb);
149 if (i != -1) {
150 if (sb.st_mode & (S_IFBLK | S_IFCHR)) {
151 /* this file is a device. we don't write back to it.
152 * we "succeed" on the assumption this is some sort
153 * of random device. Otherwise attempting to write to
154 * and chmod the device causes problems.
155 */
156 return(1);
157 }
158 }
159
160#if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32)
161 /* For some reason Win32 can't write to files created this way */
162
163 /* chmod(..., 0600) is too late to protect the file,
164 * permissions should be restrictive from the start */
165 int fd = open(file, O_CREAT, 0600);
166 if (fd != -1)
167 out = fdopen(fd, "wb");
168#endif
169 if (out == NULL)
170 out = fopen(file,"wb");
171 if (out == NULL) goto err;
172
173#ifndef NO_CHMOD
174 chmod(file,0600);
175#endif
176 n=RAND_DATA;
177 for (;;)
178 {
179 i=(n > BUFSIZE)?BUFSIZE:n;
180 n-=BUFSIZE;
181 if (RAND_bytes(buf,i) <= 0)
182 rand_err=1;
183 i=fwrite(buf,1,i,out);
184 if (i <= 0)
185 {
186 ret=0;
187 break;
188 }
189 ret+=i;
190 if (n <= 0) break;
191 }
192#ifdef OPENSSL_SYS_VMS
193 /* Try to delete older versions of the file, until there aren't
194 any */
195 {
196 char *tmpf;
197
198 tmpf = OPENSSL_malloc(strlen(file) + 4); /* to add ";-1" and a nul */
199 if (tmpf)
200 {
201 strcpy(tmpf, file);
202 strcat(tmpf, ";-1");
203 while(delete(tmpf) == 0)
204 ;
205 rename(file,";1"); /* Make sure it's version 1, or we
206 will reach the limit (32767) at
207 some point... */
208 }
209 }
210#endif /* OPENSSL_SYS_VMS */
211
212 fclose(out);
213 memset(buf,0,BUFSIZE);
214err:
215 return (rand_err ? -1 : ret);
216 }
217
218const char *RAND_file_name(char *buf, size_t size)
219 {
220 char *s=NULL;
221 int ok = 0;
222 struct stat sb;
223
224 if (issetugid() == 0)
225 s=getenv("RANDFILE");
226 if (s != NULL && *s && strlen(s) + 1 < size)
227 {
228 strlcpy(buf,s,size);
229 ok = 1;
230 }
231 else
232 {
233 if (issetugid() == 0)
234 s=getenv("HOME");
235#ifdef DEFAULT_HOME
236 if (s == NULL)
237 {
238 s = DEFAULT_HOME;
239 }
240#endif
241 if (s && *s && strlen(s)+strlen(RFILE)+2 < size)
242 {
243 strlcpy(buf,s,size);
244#ifndef OPENSSL_SYS_VMS
245 strlcat(buf,"/",size);
246#endif
247 strlcat(buf,RFILE,size);
248 ok = 1;
249 }
250 else
251 buf[0] = '\0'; /* no file name */
252 }
253
254#ifdef __OpenBSD__
255 /* given that all random loads just fail if the file can't be
256 * seen on a stat, we stat the file we're returning, if it
257 * fails, use /dev/arandom instead. this allows the user to
258 * use their own source for good random data, but defaults
259 * to something hopefully decent if that isn't available.
260 */
261
262 if (!ok)
263 if (strlcpy(buf,"/dev/arandom",size) >= size) {
264 return(NULL);
265 }
266 if (stat(buf,&sb) == -1)
267 if (strlcpy(buf,"/dev/arandom",size) >= size) {
268 return(NULL);
269 }
270
271#endif
272 return(buf);
273 }
diff --git a/src/lib/libcrypto/rand/randtest.c b/src/lib/libcrypto/rand/randtest.c
index 701932e6ee..b64de616db 100644
--- a/src/lib/libcrypto/rand/randtest.c
+++ b/src/lib/libcrypto/rand/randtest.c
@@ -60,8 +60,6 @@
60#include <stdlib.h> 60#include <stdlib.h>
61#include <openssl/rand.h> 61#include <openssl/rand.h>
62 62
63#include "../e_os.h"
64
65/* some FIPS 140-1 random number test */ 63/* some FIPS 140-1 random number test */
66/* some simple tests */ 64/* some simple tests */
67 65
@@ -211,6 +209,6 @@ int main()
211 printf("test 4 done\n"); 209 printf("test 4 done\n");
212 err: 210 err:
213 err=((err)?1:0); 211 err=((err)?1:0);
214 EXIT(err); 212 exit(err);
215 return(err); 213 return(err);
216 } 214 }
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-08-04 14:13:33 +0000