oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Always use the RAND_ interface now that hcrypto provides it.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20062 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-01-30 18:02:21 +00:00
parent 942fb2686e
commit 169143c4ff
1 changed files with 3 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/krb5/crypto.c
View File

@@ -3438,11 +3438,8 @@ krb5_decrypt_EncryptedData(krb5_context context,
* *
************************************************************/
#ifdef HAVE_OPENSSL
#include <openssl/rand.h>
#define ENTROPY_NEEDED 128
/* From openssl/crypto/rand/rand_lcl.h */
#define ENTROPY_NEEDED 20
static int
seed_something(void)
{
@@ -3498,7 +3495,8 @@ krb5_generate_random_block(void *buf, size_t len)
HEIMDAL_MUTEX_lock(&crypto_mutex);
if (!rng_initialized) {
if (seed_something())
krb5_abortx(NULL, "Fatal: could not seed the random number generator");
krb5_abortx(NULL, "Fatal: could not seed the "
"random number generator");
rng_initialized = 1;
}
@@ -3507,38 +3505,6 @@ krb5_generate_random_block(void *buf, size_t len)
krb5_abortx(NULL, "Failed to generate random block");
}
#else
void KRB5_LIB_FUNCTION
krb5_generate_random_block(void *buf, size_t len)
{
DES_cblock key, out;
static DES_cblock counter;
static DES_key_schedule schedule;
int i;
static int initialized = 0;
HEIMDAL_MUTEX_lock(&crypto_mutex);
if(!initialized) {
DES_new_random_key(&key);
DES_set_key(&key, &schedule);
memset(&key, 0, sizeof(key));
DES_new_random_key(&counter);
initialized = 1;
}
HEIMDAL_MUTEX_unlock(&crypto_mutex);
while(len > 0) {
DES_ecb_encrypt(&counter, &out, &schedule, DES_ENCRYPT);
for(i = 7; i >=0; i--)
if(counter[i]++)
break;
memcpy(buf, out, min(len, sizeof(out)));
len -= min(len, sizeof(out));
buf = (char*)buf + sizeof(out);
}
}
#endif
static void
DES3_postproc(krb5_context context,
unsigned char *k, size_t len, struct key_data *key)