mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-07 23:27:48 +02:00
(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:
parent
2639033890
commit
ecb6f4c2f7
|
@ -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>
|
2004-08-18 Werner Koch <wk@g10code.de>
|
||||||
|
|
||||||
* passphrase.c (agent_get_passphrase): Fixed detection of canceled
|
* passphrase.c (agent_get_passphrase): Fixed detection of canceled
|
||||||
|
|
13
g10/seskey.c
13
g10/seskey.c
|
@ -1,5 +1,5 @@
|
||||||
/* seskey.c - make sesssion keys etc.
|
/* 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.
|
* This file is part of GnuPG.
|
||||||
*
|
*
|
||||||
|
@ -117,11 +117,14 @@ encode_session_key( DEK *dek, unsigned nbits )
|
||||||
k++;
|
k++;
|
||||||
if( !k )
|
if( !k )
|
||||||
break; /* okay: no zero bytes */
|
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);
|
pp = get_random_bits( k*8, 1, 1);
|
||||||
for(j=0; j < i && k ; j++ )
|
for (j=0; j < i && k; ) {
|
||||||
if( !p[j] )
|
if ( !p[j] )
|
||||||
p[j] = pp[--k];
|
p[j] = pp[--k];
|
||||||
|
if (p[j])
|
||||||
|
j++;
|
||||||
|
}
|
||||||
m_free(pp);
|
m_free(pp);
|
||||||
}
|
}
|
||||||
memcpy( frame+n, p, i );
|
memcpy( frame+n, p, i );
|
||||||
|
|
Loading…
Reference in New Issue
Block a user