security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

(encode_session_key): Changed the zero random byte 

substituting code to actually do clever things.  Thanks to
Matthias Urlichs for noting the implementation problem.
This commit is contained in:
Werner Koch 2004-08-19 09:29:23 +00:00
parent 2639033890
commit ecb6f4c2f7
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2004-08-19 Werner Koch <wk@g10code.de>
* seskey.c (encode_session_key): Changed the zero random byte
substituting code to actually do clever things. Thanks to
Matthias Urlichs for noting the implementation problem.
2004-08-18 Werner Koch <wk@g10code.de>
* passphrase.c (agent_get_passphrase): Fixed detection of canceled

13
g10/seskey.c
View File

@ -1,5 +1,5 @@
/* seskey.c - make sesssion keys etc.
* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
* Copyright (C) 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc.
*
* This file is part of GnuPG.
*
@ -117,11 +117,14 @@ encode_session_key( DEK *dek, unsigned nbits )
k++;
if( !k )
break; /* okay: no zero bytes */
k += k/128; /* better get some more */
k += (k/128) + 3; /* better get some more */
pp = get_random_bits( k*8, 1, 1);
for(j=0; j < i && k ; j++ )
if( !p[j] )
p[j] = pp[--k];
for (j=0; j < i && k; ) {
if ( !p[j] )
p[j] = pp[--k];
if (p[j])
j++;
}
m_free(pp);
}
memcpy( frame+n, p, i );