summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortedu <>2014-04-18 18:01:06 +0000
committertedu <>2014-04-18 18:01:06 +0000
commitb9964e4494b9952ca7ff8c82089fdd781cb51b2f (patch)
treeefc180aecaadad50bf0cadd6c4d5aabc3989bee3 /src
parentab3d8bcfb074e6d61ef34d64d022a0d5c8867e71 (diff)
downloadopenbsd-b9964e4494b9952ca7ff8c82089fdd781cb51b2f.tar.gz
openbsd-b9964e4494b9952ca7ff8c82089fdd781cb51b2f.tar.bz2
openbsd-b9964e4494b9952ca7ff8c82089fdd781cb51b2f.zip
another "string to make the random number generator think it has entropy"
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/apps/speed.c23
1 files changed, 0 insertions, 23 deletions
diff --git a/src/lib/libssl/src/apps/speed.c b/src/lib/libssl/src/apps/speed.c
index 9ff417c993..f1bf226136 100644
--- a/src/lib/libssl/src/apps/speed.c
+++ b/src/lib/libssl/src/apps/speed.c
@@ -246,11 +246,6 @@ static double ecdsa_results[EC_NUM][2];
246static double ecdh_results[EC_NUM][1]; 246static double ecdh_results[EC_NUM][1];
247#endif 247#endif
248 248
249#if defined(OPENSSL_NO_DSA) && !(defined(OPENSSL_NO_ECDSA) && defined(OPENSSL_NO_ECDH))
250static const char rnd_seed[] = "string to make the random number generator think it has entropy";
251static int rnd_fake = 0;
252#endif
253
254#ifdef SIGALRM 249#ifdef SIGALRM
255#if defined(__STDC__) || defined(sgi) || defined(_AIX) 250#if defined(__STDC__) || defined(sgi) || defined(_AIX)
256#define SIGRETTYPE void 251#define SIGRETTYPE void
@@ -1958,10 +1953,6 @@ speed_main(int argc, char **argv)
1958 1953
1959 RAND_pseudo_bytes(buf, 20); 1954 RAND_pseudo_bytes(buf, 20);
1960#ifndef OPENSSL_NO_DSA 1955#ifndef OPENSSL_NO_DSA
1961 if (RAND_status() != 1) {
1962 RAND_seed(rnd_seed, sizeof rnd_seed);
1963 rnd_fake = 1;
1964 }
1965 for (j = 0; j < DSA_NUM; j++) { 1956 for (j = 0; j < DSA_NUM; j++) {
1966 unsigned int kk; 1957 unsigned int kk;
1967 int ret; 1958 int ret;
@@ -2035,15 +2026,9 @@ speed_main(int argc, char **argv)
2035 dsa_doit[j] = 0; 2026 dsa_doit[j] = 0;
2036 } 2027 }
2037 } 2028 }
2038 if (rnd_fake)
2039 RAND_cleanup();
2040#endif 2029#endif
2041 2030
2042#ifndef OPENSSL_NO_ECDSA 2031#ifndef OPENSSL_NO_ECDSA
2043 if (RAND_status() != 1) {
2044 RAND_seed(rnd_seed, sizeof rnd_seed);
2045 rnd_fake = 1;
2046 }
2047 for (j = 0; j < EC_NUM; j++) { 2032 for (j = 0; j < EC_NUM; j++) {
2048 int ret; 2033 int ret;
2049 2034
@@ -2130,15 +2115,9 @@ speed_main(int argc, char **argv)
2130 } 2115 }
2131 } 2116 }
2132 } 2117 }
2133 if (rnd_fake)
2134 RAND_cleanup();
2135#endif 2118#endif
2136 2119
2137#ifndef OPENSSL_NO_ECDH 2120#ifndef OPENSSL_NO_ECDH
2138 if (RAND_status() != 1) {
2139 RAND_seed(rnd_seed, sizeof rnd_seed);
2140 rnd_fake = 1;
2141 }
2142 for (j = 0; j < EC_NUM; j++) { 2121 for (j = 0; j < EC_NUM; j++) {
2143 if (!ecdh_doit[j]) 2122 if (!ecdh_doit[j])
2144 continue; 2123 continue;
@@ -2221,8 +2200,6 @@ speed_main(int argc, char **argv)
2221 ecdh_doit[j] = 0; 2200 ecdh_doit[j] = 0;
2222 } 2201 }
2223 } 2202 }
2224 if (rnd_fake)
2225 RAND_cleanup();
2226#endif 2203#endif
2227#ifndef NO_FORK 2204#ifndef NO_FORK
2228show_res: 2205show_res: