989d921f5d
I'm very pleased to announce the release of our new website and documentation using the new toolchain with Hugo and AsciiDoctor. To get more information about the new toolchain please read the FreeBSD Documentation Project Primer[1], Hugo docs[2] and AsciiDoctor docs[3]. Acknowledgment: Benedict Reuschling <bcr@> Glen Barber <gjb@> Hiroki Sato <hrs@> Li-Wen Hsu <lwhsu@> Sean Chittenden <seanc@> The FreeBSD Foundation [1] https://docs.FreeBSD.org/en/books/fdp-primer/ [2] https://gohugo.io/documentation/ [3] https://docs.asciidoctor.org/home/ Approved by: doceng, core
86 lines
2.3 KiB
Diff
86 lines
2.3 KiB
Diff
Index: crypto/openssl/crypto/rand/md_rand.c
|
|
===================================================================
|
|
RCS file: /home/ncvs/src/crypto/openssl/crypto/rand/md_rand.c,v
|
|
retrieving revision 1.1.1.1.2.2
|
|
retrieving revision 1.1.1.1.2.2.2.1
|
|
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.2.2.1
|
|
--- crypto/openssl/crypto/rand/md_rand.c 2000/11/26 11:33:48 1.1.1.1.2.2
|
|
+++ crypto/openssl/crypto/rand/md_rand.c 2001/07/19 21:01:08 1.1.1.1.2.2.2.1
|
|
@@ -308,6 +308,7 @@
|
|
{
|
|
static volatile int stirred_pool = 0;
|
|
int i,j,k,st_num,st_idx;
|
|
+ int num_ceil;
|
|
int ok;
|
|
long md_c[2];
|
|
unsigned char local_md[MD_DIGEST_LENGTH];
|
|
@@ -328,6 +329,12 @@
|
|
}
|
|
#endif
|
|
|
|
+ if (num <= 0)
|
|
+ return 1;
|
|
+
|
|
+ /* round upwards to multiple of MD_DIGEST_LENGTH/2 */
|
|
+ num_ceil = (1 + (num-1)/(MD_DIGEST_LENGTH/2)) * (MD_DIGEST_LENGTH/2);
|
|
+
|
|
/*
|
|
* (Based on the rand(3) manpage:)
|
|
*
|
|
@@ -409,11 +416,11 @@
|
|
md_c[1] = md_count[1];
|
|
memcpy(local_md, md, sizeof md);
|
|
|
|
- state_index+=num;
|
|
+ state_index+=num_ceil;
|
|
if (state_index > state_num)
|
|
state_index %= state_num;
|
|
|
|
- /* state[st_idx], ..., state[(st_idx + num - 1) % st_num]
|
|
+ /* state[st_idx], ..., state[(st_idx + num_ceil - 1) % st_num]
|
|
* are now ours (but other threads may use them too) */
|
|
|
|
md_count[0] += 1;
|
|
@@ -424,6 +431,7 @@
|
|
|
|
while (num > 0)
|
|
{
|
|
+ /* num_ceil -= MD_DIGEST_LENGTH/2 */
|
|
j=(num >= MD_DIGEST_LENGTH/2)?MD_DIGEST_LENGTH/2:num;
|
|
num-=j;
|
|
MD_Init(&m);
|
|
@@ -434,27 +442,28 @@
|
|
curr_pid = 0;
|
|
}
|
|
#endif
|
|
- MD_Update(&m,&(local_md[MD_DIGEST_LENGTH/2]),MD_DIGEST_LENGTH/2);
|
|
+ MD_Update(&m,local_md,MD_DIGEST_LENGTH);
|
|
MD_Update(&m,(unsigned char *)&(md_c[0]),sizeof(md_c));
|
|
#ifndef PURIFY
|
|
MD_Update(&m,buf,j); /* purify complains */
|
|
#endif
|
|
- k=(st_idx+j)-st_num;
|
|
+ k=(st_idx+MD_DIGEST_LENGTH/2)-st_num;
|
|
if (k > 0)
|
|
{
|
|
- MD_Update(&m,&(state[st_idx]),j-k);
|
|
+ MD_Update(&m,&(state[st_idx]),MD_DIGEST_LENGTH/2-k);
|
|
MD_Update(&m,&(state[0]),k);
|
|
}
|
|
else
|
|
- MD_Update(&m,&(state[st_idx]),j);
|
|
+ MD_Update(&m,&(state[st_idx]),MD_DIGEST_LENGTH/2);
|
|
MD_Final(local_md,&m);
|
|
|
|
- for (i=0; i<j; i++)
|
|
+ for (i=0; i<MD_DIGEST_LENGTH/2; i++)
|
|
{
|
|
state[st_idx++]^=local_md[i]; /* may compete with other threads */
|
|
- *(buf++)=local_md[i+MD_DIGEST_LENGTH/2];
|
|
if (st_idx >= st_num)
|
|
st_idx=0;
|
|
+ if (i < j)
|
|
+ *(buf++)=local_md[i+MD_DIGEST_LENGTH/2];
|
|
}
|
|
}
|
|
|