Allow master key to be passed in on the command line. Makes testing

scripts easier.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4472 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 29 insertions, 5 deletions

diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c
index c2f0813..d5671e0 100644
--- a/src/tests/verify/kdb5_verify.c
+++ b/src/tests/verify/kdb5_verify.c
@@ -81,6 +81,7 @@ char *str_master_princ;
 static char *progname;
 static char *cur_realm = 0;
 static char *mkey_name = 0;
+static char *mkey_password = 0;
 static krb5_boolean manual_mkey = FALSE;
 static krb5_boolean dbactive = FALSE;
 
@@ -128,11 +129,14 @@ char *argv[];
     num_to_check = 0;
     depth = 1;
 
-    while ((optchar = getopt(argc, argv, "D:p:n:d:r:R:k:M:e:m")) != EOF) {
+    while ((optchar = getopt(argc, argv, "D:P:p:n:d:r:R:k:M:e:m")) != EOF) {
 	switch(optchar) {
 	case 'D':
 	    depth = atoi(optarg);       /* how deep to go */
 	    break;
+        case 'P':		/* Only used for testing!!! */
+	    mkey_password = optarg;
+	    break;
 	case 'p':                       /* prefix name to check */
 	    strcpy(principal_string, optarg);
 	    suffix = principal_string + strlen(principal_string);
@@ -376,6 +380,7 @@ char *dbname;
     int nentries;
     krb5_boolean more;
     register krb5_cryptosystem_entry *csentry;
+    krb5_data pwd, scratch;
 
     csentry = master_encblock.crypto_entry;
 
@@ -391,10 +396,29 @@ char *dbname;
 	com_err(pname, retval, "while setting up master key name");
 	return(1);
     }
-    if (retval = krb5_db_fetch_mkey(master_princ, &master_encblock,
-				    manual_mkey, FALSE, 0, &master_keyblock)) {
-	com_err(pname, retval, "while reading master key");
-	return(1);
+    if (mkey_password) {
+	pwd.data = mkey_password;
+	pwd.length = strlen(mkey_password);
+	retval = krb5_principal2salt(master_princ, &scratch);
+	if (retval) {
+	    com_err(pname, retval, "while calculated master key salt");
+	    return(1);
+	}
+	retval = krb5_string_to_key(&master_encblock, master_keyblock.keytype,
+				    &master_keyblock, &pwd, &scratch);
+	if (retval) {
+	    com_err(pname, retval,
+		    "while transforming master key from password");
+	    return(1);
+	}
+	free(scratch.data);
+    } else {
+	if (retval = krb5_db_fetch_mkey(master_princ, &master_encblock,
+					manual_mkey, FALSE, 0,
+					&master_keyblock)) {
+	    com_err(pname, retval, "while reading master key");
+	    return(1);
+	}
     }
     if (retval = krb5_db_init()) {
 	com_err(pname, retval, "while initializing database");