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.

1 files changed, 2 insertions, 4 deletions

diff --git a/crypto/kerberosIV/admin/kdb_edit.c b/crypto/kerberosIV/admin/kdb_edit.c
index 1ba6aaf..1c1f95c 100644
--- a/crypto/kerberosIV/admin/kdb_edit.c
+++ b/crypto/kerberosIV/admin/kdb_edit.c
@@ -8,6 +8,7 @@
  * This routine changes the Kerberos encryption keys for principals,
  * i.e., users or services. 
  */
+/* $FreeBSD$ */
 
 /*
  * exit returns 	 0 ==> success -1 ==> error 
@@ -162,7 +163,7 @@ change_principal(void)
 			memset(new_key, 0, sizeof(des_cblock));
 			new_key[0] = 127;
 #else
-			des_new_random_key(&new_key);
+			des_random_key(new_key);
 #endif
 			memset(pw_str, 0, sizeof pw_str);
 		    }
@@ -384,9 +385,6 @@ main(int argc, char **argv)
 						    stdout)) < 0)
       return 1;
 
-    /* Initialize non shared random sequence */
-    des_init_random_number_generator(&master_key);
-
     /* lookup the default values */
     n = kerb_get_principal(KERB_DEFAULT_NAME, KERB_DEFAULT_INST,
 			   &default_princ, 1, &more);