1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
|
/* Copyright 2001-2005 The Apache Software Foundation or its licensors, as
* applicable.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "mod_nss.h"
/* _________________________________________________________________
**
** Support for better seeding of SSL library's RNG
** _________________________________________________________________
*/
static int nss_rand_choosenum(int, int);
static int nss_rand_feedfp(apr_pool_t *, apr_file_t *, int);
int nss_rand_seed(server_rec *s, apr_pool_t *p, ssl_rsctx_t nCtx, char *prefix)
{
SSLModConfigRec *mc;
apr_array_header_t *apRandSeed;
ssl_randseed_t *pRandSeeds;
ssl_randseed_t *pRandSeed;
unsigned char stackdata[256];
int nReq, nDone;
apr_file_t *fp;
int i, n, l;
mc = myModConfig(s);
nReq = 0;
nDone = 0;
apRandSeed = mc->aRandSeed;
pRandSeeds = (ssl_randseed_t *)apRandSeed->elts;
for (i = 0; i < apRandSeed->nelts; i++) {
pRandSeed = &pRandSeeds[i];
if (pRandSeed->nCtx == nCtx) {
nReq += pRandSeed->nBytes;
if (pRandSeed->nSrc == SSL_RSSRC_FILE) {
/*
* seed in contents of an external file
*/
if (apr_file_open(&fp, pRandSeed->cpPath,
APR_READ, APR_OS_DEFAULT, p) != APR_SUCCESS)
continue;
nDone += nss_rand_feedfp(p, fp, pRandSeed->nBytes);
apr_file_close(fp);
}
else if (pRandSeed->nSrc == SSL_RSSRC_EXEC) {
const char *cmd = pRandSeed->cpPath;
const char **argv = apr_palloc(p, sizeof(char *) * 3);
/*
* seed in contents generated by an external program
*/
argv[0] = cmd;
argv[1] = apr_itoa(p, pRandSeed->nBytes);
argv[2] = NULL;
if ((fp = nss_util_ppopen(s, p, cmd, argv)) == NULL)
continue;
nDone += nss_rand_feedfp(p, fp, pRandSeed->nBytes);
nss_util_ppclose(s, p, fp);
}
else if (pRandSeed->nSrc == SSL_RSSRC_BUILTIN) {
struct {
time_t t;
pid_t pid;
} my_seed;
/*
* seed in the current time (usually just 4 bytes)
*/
my_seed.t = time(NULL);
/*
* seed in the current process id (usually just 4 bytes)
*/
my_seed.pid = mc->pid;
l = sizeof(my_seed);
PK11_RandomUpdate((unsigned char *)&my_seed, l);
nDone += l;
/*
* seed in some current state of the run-time stack (128 bytes)
*/
n = nss_rand_choosenum(0, sizeof(stackdata)-128-1);
PK11_RandomUpdate(stackdata+n, 128);
nDone += 128;
}
}
}
if (nDone > 0)
ap_log_error(APLOG_MARK, APLOG_INFO, 0, s,
"%sSeeding PRNG with %d bytes of entropy", prefix, nDone);
return nDone;
}
#define BUFSIZE 8192
static int nss_rand_feedfp(apr_pool_t *p, apr_file_t *fp, int nReq)
{
apr_size_t nDone;
unsigned char caBuf[BUFSIZE];
apr_size_t nBuf;
apr_size_t nRead;
apr_size_t nTodo;
nDone = 0;
nRead = BUFSIZE;
nTodo = nReq;
while (1) {
if (nReq > 0)
nRead = (nTodo < BUFSIZE ? nTodo : BUFSIZE);
nBuf = nRead;
if (apr_file_read(fp, caBuf, &nBuf) != APR_SUCCESS)
break;
PK11_RandomUpdate(caBuf, nBuf);
nDone += nBuf;
if (nReq > 0) {
nTodo -= nBuf;
if (nTodo <= 0)
break;
}
}
return nDone;
}
static int nss_rand_choosenum(int l, int h)
{
int i;
char buf[50];
apr_snprintf(buf, sizeof(buf), "%.0f",
(((double)(rand()%RAND_MAX)/RAND_MAX)*(h-l)));
i = atoi(buf)+1;
if (i < l) i = l;
if (i > h) i = h;
return i;
}
|
