1 files changed, 29 insertions, 20 deletions

diff --git a/src/lib/des425/random_key.c b/src/lib/des425/random_key.c
index 04399c1..fde324d 100644
--- a/src/lib/des425/random_key.c
+++ b/src/lib/des425/random_key.c
@@ -23,39 +23,48 @@
  *
  */
 
+/*
+ * Copyright (C) 1998 by the FundsXpress, INC.
+ * 
+ * All rights reserved.
+ * 
+ * Export of this software from the United States of America may require
+ * a specific license from the United States Government.  It is the
+ * responsibility of any person or organization contemplating export to
+ * obtain such a license before exporting.
+ * 
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of FundsXpress. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission.  FundsXpress makes no representations about the suitability of
+ * this software for any purpose.  It is provided "as is" without express
+ * or implied warranty.
+ * 
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ */
 
 #include "des.h"
 
-extern krb5_pointer des425_random_state;
-
 /* random_key */
 int
 des_random_key(key)
     mit_des_cblock *key;
 {
-    krb5_encrypt_block	eblock;
     krb5_keyblock	keyblock;
-    krb5_keyblock	*new_key;
     krb5_error_code	kret;
-    mit_des_cblock	nullkey;
-
-    krb5_use_enctype(NULL, &eblock, ENCTYPE_DES_CBC_CRC);
-
-    memset(nullkey, 0, sizeof(mit_des_cblock));
-    mit_des_fixup_key_parity(*key);
-
-    keyblock.enctype = ENCTYPE_DES_CBC_CRC;
-    keyblock.length = sizeof(mit_des_cblock);
-    keyblock.contents = (krb5_octet *)nullkey;
 
-    if (! des425_random_state)
-	mit_des_init_random_key(&eblock, &keyblock, &des425_random_state);
+    if (kret = krb5_c_make_random_key(/* XXX */ 0, ENCTYPE_DES_CBC_CRC,
+				      &keyblock))
+	return(kret);
 
-    kret = mit_des_random_key(NULL, des425_random_state, &new_key);
-    if (kret) return kret;
+    memcpy(key, keyblock.contents, sizeof(mit_des_cblock));
 
-    memcpy(key, new_key->contents, sizeof(mit_des_cblock));
-    krb5_free_keyblock(NULL, new_key);
     return(0);
 }