diff options
author | nectar <nectar@FreeBSD.org> | 2003-01-29 18:14:29 +0000 |
---|---|---|
committer | nectar <nectar@FreeBSD.org> | 2003-01-29 18:14:29 +0000 |
commit | 637cc179f5d0e82dfd99e85e20f6200d21ad09c9 (patch) | |
tree | 35ede372953bd23d387eaae5364ee7720ca52d47 /crypto/kerberosIV/server/kerberos.c | |
parent | 224d4fa7016e3053b02edc999bef91300ba90811 (diff) | |
download | FreeBSD-src-637cc179f5d0e82dfd99e85e20f6200d21ad09c9.zip FreeBSD-src-637cc179f5d0e82dfd99e85e20f6200d21ad09c9.tar.gz |
Background:
When libdes was replaced with OpenSSL's libcrypto, there were a few
interfaces that the former implemented but the latter did not. Because
some software in the base system still depended upon these interfaces,
we simply included them in our libcrypto (rnd_keys.c).
Now, finally get around to removing the dependencies on these
interfaces. There were basically two cases:
des_new_random_key -- This is just a wrapper for des_random_key, and
these calls were replaced.
des_init_random_number_generator et. al. -- A few functions were used
by the application to seed libdes's PRNG. These are not necessary
when using libcrypto, as OpenSSL internally seeds the PRNG from
/dev/random. These calls were simply removed.
Again, some of the Kerberos 4 files have been taken off the vendor
branch. I do not expect there to be future imports of KTH Kerberos 4.
Diffstat (limited to 'crypto/kerberosIV/server/kerberos.c')
-rw-r--r-- | crypto/kerberosIV/server/kerberos.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/kerberosIV/server/kerberos.c b/crypto/kerberosIV/server/kerberos.c index 9e0d9b3..f4ffbc1 100644 --- a/crypto/kerberosIV/server/kerberos.c +++ b/crypto/kerberosIV/server/kerberos.c @@ -334,7 +334,7 @@ kerberos(unsigned char *buf, int len, life = min(life, s_name.max_life); life = min(life, a_name.max_life); - des_new_random_key(&session); + des_random_key(session); copy_to_key(&s_name.key_low, &s_name.key_high, key); unseal(&key); krb_create_ticket(tk, flags, a_name.name, a_name.instance, @@ -428,7 +428,7 @@ kerberos(unsigned char *buf, int len, life = min(life, s_name.max_life); copy_to_key(&s_name.key_low, &s_name.key_high, key); unseal(&key); - des_new_random_key(&session); + des_random_key(session); krb_create_ticket(tk, flags, ad.pname, ad.pinst, ad.prealm, client->sin_addr.s_addr, &session, life, kerb_time.tv_sec, @@ -860,7 +860,6 @@ main(int argc, char **argv) fprintf(stdout, "\nCurrent Kerberos master key version is %d\n", master_key_version); - des_init_random_number_generator(&master_key); if (!rflag) { /* Look up our local realm */ |