summaryrefslogtreecommitdiff
path: root/src/lib/libssl/src
diff options
context:
space:
mode:
authortedu <>2014-04-18 13:19:03 +0000
committertedu <>2014-04-18 13:19:03 +0000
commit832462aba45ebae5b73157540ef0383e86cde58a (patch)
tree3b966b1e6478816bc9e673717596fca44b3c34de /src/lib/libssl/src
parent00bec8c2ad4913d82c5df6a17d0c65f42971782f (diff)
downloadopenbsd-832462aba45ebae5b73157540ef0383e86cde58a.tar.gz
openbsd-832462aba45ebae5b73157540ef0383e86cde58a.tar.bz2
openbsd-832462aba45ebae5b73157540ef0383e86cde58a.zip
another round of chemo for the RAND code to provide clarity.
ok deraadt
Diffstat (limited to 'src/lib/libssl/src')
-rw-r--r--src/lib/libssl/src/crypto/rand/rand_lib.c238
-rw-r--r--src/lib/libssl/src/crypto/rand/rand_unix.c121
-rw-r--r--src/lib/libssl/src/crypto/rand/randfile.c53
-rw-r--r--src/lib/libssl/src/crypto/rand/rc4_rand.c52
4 files changed, 85 insertions, 379 deletions
diff --git a/src/lib/libssl/src/crypto/rand/rand_lib.c b/src/lib/libssl/src/crypto/rand/rand_lib.c
index 243a87ddfb..6d61b3d3f6 100644
--- a/src/lib/libssl/src/crypto/rand/rand_lib.c
+++ b/src/lib/libssl/src/crypto/rand/rand_lib.c
@@ -1,177 +1,97 @@
1/* crypto/rand/rand_lib.c */ 1/*
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2 * Copyright (c) 2014 Ted Unangst <tedu@openbsd.org>
3 * All rights reserved.
4 * 3 *
5 * This package is an SSL implementation written 4 * Permission to use, copy, modify, and distribute this software for any
6 * by Eric Young (eay@cryptsoft.com). 5 * purpose with or without fee is hereby granted, provided that the above
7 * The implementation was written so as to conform with Netscapes SSL. 6 * copyright notice and this permission notice appear in all copies.
8 * 7 *
9 * This library is free for commercial and non-commercial use as long as 8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 * the following conditions are aheared to. The following conditions 9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 * apply to all code found in this distribution, be it the RC4, RSA, 10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation 11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 * included with this distribution is covered by the same copyright terms 12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com). 13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 * 14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
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 */ 15 */
58
59#include <stdio.h>
60#include <time.h>
61#include "cryptlib.h" 16#include "cryptlib.h"
62#include <openssl/rand.h> 17#include <openssl/rand.h>
63 18
64#ifndef OPENSSL_NO_ENGINE 19#include <stdlib.h>
65#include <openssl/engine.h>
66#endif
67 20
68#ifndef OPENSSL_NO_ENGINE 21/*
69/* non-NULL if default_RAND_meth is ENGINE-provided */ 22 * The useful functions in this file are at the bottom.
70static ENGINE *funct_ref =NULL; 23 */
71#endif 24int
72static const RAND_METHOD *default_RAND_meth = NULL; 25RAND_set_rand_method(const RAND_METHOD *meth)
73 26{
74int RAND_set_rand_method(const RAND_METHOD *meth)
75 {
76#ifndef OPENSSL_NO_ENGINE
77 if(funct_ref)
78 {
79 ENGINE_finish(funct_ref);
80 funct_ref = NULL;
81 }
82#endif
83 default_RAND_meth = meth;
84 return 1; 27 return 1;
85 } 28}
86 29
87const RAND_METHOD *RAND_get_rand_method(void) 30const RAND_METHOD *
88 { 31RAND_get_rand_method(void)
89 if (!default_RAND_meth) 32{
90 { 33 return NULL;
91#ifndef OPENSSL_NO_ENGINE 34}
92 ENGINE *e = ENGINE_get_default_RAND(); 35
93 if(e) 36RAND_METHOD *
94 { 37RAND_SSLeay(void)
95 default_RAND_meth = ENGINE_get_RAND(e); 38{
96 if(!default_RAND_meth) 39 return NULL;
97 { 40}
98 ENGINE_finish(e);
99 e = NULL;
100 }
101 }
102 if(e)
103 funct_ref = e;
104 else
105#endif
106 default_RAND_meth = RAND_SSLeay();
107 }
108 return default_RAND_meth;
109 }
110 41
111#ifndef OPENSSL_NO_ENGINE 42#ifndef OPENSSL_NO_ENGINE
112int RAND_set_rand_engine(ENGINE *engine) 43int
113 { 44RAND_set_rand_engine(ENGINE *engine)
114 const RAND_METHOD *tmp_meth = NULL; 45{
115 if(engine)
116 {
117 if(!ENGINE_init(engine))
118 return 0;
119 tmp_meth = ENGINE_get_RAND(engine);
120 if(!tmp_meth)
121 {
122 ENGINE_finish(engine);
123 return 0;
124 }
125 }
126 /* This function releases any prior ENGINE so call it first */
127 RAND_set_rand_method(tmp_meth);
128 funct_ref = engine;
129 return 1; 46 return 1;
130 } 47}
131#endif 48#endif
132 49
133void RAND_cleanup(void) 50void
134 { 51RAND_cleanup(void)
135 const RAND_METHOD *meth = RAND_get_rand_method(); 52{
136 if (meth && meth->cleanup) 53
137 meth->cleanup(); 54}
138 RAND_set_rand_method(NULL); 55
139 } 56void
57RAND_seed(const void *buf, int num)
58{
59
60}
140 61
141void RAND_seed(const void *buf, int num) 62void
142 { 63RAND_add(const void *buf, int num, double entropy)
143 const RAND_METHOD *meth = RAND_get_rand_method(); 64{
144 if (meth && meth->seed)
145 meth->seed(buf,num);
146 }
147 65
148void RAND_add(const void *buf, int num, double entropy) 66}
149 {
150 const RAND_METHOD *meth = RAND_get_rand_method();
151 if (meth && meth->add)
152 meth->add(buf,num,entropy);
153 }
154 67
155int RAND_bytes(unsigned char *buf, int num) 68int
156 { 69RAND_status(void)
157 const RAND_METHOD *meth = RAND_get_rand_method(); 70{
158 if (meth && meth->bytes) 71 return 1;
159 return meth->bytes(buf,num); 72}
160 return(-1);
161 }
162 73
163int RAND_pseudo_bytes(unsigned char *buf, int num) 74int
164 { 75RAND_poll(void)
165 const RAND_METHOD *meth = RAND_get_rand_method(); 76{
166 if (meth && meth->pseudorand) 77 return 1;
167 return meth->pseudorand(buf,num); 78}
168 return(-1);
169 }
170 79
171int RAND_status(void) 80/*
172 { 81 * Hurray. You've made it to the good parts.
173 const RAND_METHOD *meth = RAND_get_rand_method(); 82 */
174 if (meth && meth->status) 83int
175 return meth->status(); 84RAND_bytes(unsigned char *buf, int num)
176 return 0; 85{
177 } 86 if (num > 0)
87 arc4random_buf(buf, num);
88 return 1;
89}
90
91int
92RAND_pseudo_bytes(unsigned char *buf, int num)
93{
94 if (num > 0)
95 arc4random_buf(buf, num);
96 return 1;
97}
diff --git a/src/lib/libssl/src/crypto/rand/rand_unix.c b/src/lib/libssl/src/crypto/rand/rand_unix.c
deleted file mode 100644
index a5b9b2a529..0000000000
--- a/src/lib/libssl/src/crypto/rand/rand_unix.c
+++ /dev/null
@@ -1,121 +0,0 @@
1/* crypto/rand/rand_unix.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-2006 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#include "e_os.h"
112#include "cryptlib.h"
113#include <openssl/rand.h>
114
115#include <stdlib.h>
116#include <string.h>
117
118int RAND_poll(void)
119{
120 return 1;
121}
diff --git a/src/lib/libssl/src/crypto/rand/randfile.c b/src/lib/libssl/src/crypto/rand/randfile.c
index c47d1f7224..23efa17388 100644
--- a/src/lib/libssl/src/crypto/rand/randfile.c
+++ b/src/lib/libssl/src/crypto/rand/randfile.c
@@ -74,10 +74,7 @@
74#define BUFSIZE 1024 74#define BUFSIZE 1024
75#define RAND_DATA 1024 75#define RAND_DATA 1024
76 76
77#define RFILE ".rnd" 77/* Note that these functions should not be used. */
78
79/* Note that these functions are intended for seed files only.
80 * Entropy devices and EGD sockets are handled in rand_unix.c */
81 78
82int RAND_load_file(const char *file, long bytes) 79int RAND_load_file(const char *file, long bytes)
83{ 80{
@@ -145,46 +142,8 @@ err:
145 } 142 }
146 143
147const char *RAND_file_name(char *buf, size_t size) 144const char *RAND_file_name(char *buf, size_t size)
148 { 145{
149 char *s=NULL; 146 if (BUF_strlcpy(buf,"/dev/urandom",size) >= size)
150 struct stat sb; 147 return(NULL);
151 148 return buf;
152 if (OPENSSL_issetugid() == 0) 149}
153 s=getenv("RANDFILE");
154 if (s != NULL && *s && strlen(s) + 1 < size)
155 {
156 if (BUF_strlcpy(buf,s,size) >= size)
157 return NULL;
158 }
159 else
160 {
161 if (OPENSSL_issetugid() == 0)
162 s=getenv("HOME");
163 if (s && *s && strlen(s)+strlen(RFILE)+2 < size)
164 {
165 BUF_strlcpy(buf,s,size);
166 BUF_strlcat(buf,"/",size);
167 BUF_strlcat(buf,RFILE,size);
168 }
169 else
170 buf[0] = '\0'; /* no file name */
171 }
172
173 /* given that all random loads just fail if the file can't be
174 * seen on a stat, we stat the file we're returning, if it
175 * fails, use /dev/arandom instead. this allows the user to
176 * use their own source for good random data, but defaults
177 * to something hopefully decent if that isn't available.
178 */
179
180 if (!buf[0])
181 if (BUF_strlcpy(buf,"/dev/arandom",size) >= size) {
182 return(NULL);
183 }
184 if (stat(buf,&sb) == -1)
185 if (BUF_strlcpy(buf,"/dev/arandom",size) >= size) {
186 return(NULL);
187 }
188
189 return(buf);
190 }
diff --git a/src/lib/libssl/src/crypto/rand/rc4_rand.c b/src/lib/libssl/src/crypto/rand/rc4_rand.c
deleted file mode 100644
index 47405b0d9a..0000000000
--- a/src/lib/libssl/src/crypto/rand/rc4_rand.c
+++ /dev/null
@@ -1,52 +0,0 @@
1/* $OpenBSD: rc4_rand.c,v 1.2 2014/04/16 13:57:14 reyk Exp $ */
2
3/*
4 * Copyright (c) 2014 Miodrag Vallat.
5 *
6 * Permission to use, copy, modify, and distribute this software for any
7 * purpose with or without fee is hereby granted, provided that the above
8 * copyright notice and this permission notice appear in all copies.
9 *
10 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
11 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
12 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
13 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
14 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
15 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
16 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 */
18
19#include <stdlib.h>
20
21#include <openssl/rand.h>
22
23static int
24arc4_rand_bytes(unsigned char *buf, int num)
25{
26 if (num > 0)
27 arc4random_buf(buf, (size_t)num);
28
29 return 1;
30}
31
32static int
33arc4_rand_status(void)
34{
35 /* no possible error condition */
36 return 1;
37}
38
39static RAND_METHOD rand_arc4_meth = {
40 .seed = NULL, /* no external seed allowed */
41 .bytes = arc4_rand_bytes,
42 .cleanup = NULL, /* no cleanup necessary */
43 .add = NULL, /* no external feed allowed */
44 .pseudorand = arc4_rand_bytes,
45 .status = arc4_rand_status
46};
47
48RAND_METHOD *RAND_SSLeay(void)
49{
50 return &rand_arc4_meth;
51}
52
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-10-31 19:59:52 +0000