summaryrefslogtreecommitdiffstats
path: root/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/create/ChangeLog4
-rw-r--r--src/tests/create/kdb5_mkdums.c36
-rw-r--r--src/tests/misc/test_nfold.c65
-rw-r--r--src/tests/verify/ChangeLog4
-rw-r--r--src/tests/verify/kdb5_verify.c8
5 files changed, 86 insertions, 31 deletions
diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index 64e0b2801c..ecb782e71b 100644
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,3 +1,7 @@
+1998-10-27 Marc Horowitz <marc@mit.edu>
+
+ * kdb5_mkdums.c: update to new crypto api
+
1998-05-06 Theodore Ts'o <tytso@rsts-11.mit.edu>
* kdb5_mkdums.c (argv): POSIX states that getopt returns -1
diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c
index 18ee9e8ac6..4f93766706 100644
--- a/src/tests/create/kdb5_mkdums.c
+++ b/src/tests/create/kdb5_mkdums.c
@@ -65,7 +65,6 @@ int status;
krb5_keyblock master_keyblock;
krb5_principal master_princ;
krb5_db_entry master_entry;
-krb5_encrypt_block master_encblock;
krb5_pointer master_random;
krb5_context test_context;
@@ -175,8 +174,6 @@ char *argv[];
exit(1);
}
- krb5_use_enctype(test_context, &master_encblock, master_keyblock.enctype);
-
if (!dbname)
dbname = DEFAULT_KDB_FILE; /* XXX? */
@@ -207,9 +204,6 @@ char *argv[];
}
}
- krb5_finish_random_key(test_context, &master_encblock, &master_random);
- krb5_finish_key(test_context, &master_encblock);
-
retval = krb5_db_fini(test_context);
memset((char *)master_keyblock.contents, 0, master_keyblock.length);
if (retval && retval != KRB5_KDB_DBNOTINITED) {
@@ -280,8 +274,8 @@ add_princ(context, str_newprinc)
pwd.length = strlen(princ_name);
pwd.data = princ_name; /* must be able to regenerate */
- if ((retval = krb5_string_to_key(context, &master_encblock,
- &key, &pwd, &salt))) {
+ if ((retval = krb5_c_string_to_key(context, master_keyblock.enctype,
+ &pwd, &salt, &key))) {
com_err(progname,retval,"while converting password to key for '%s'",
princ_name);
krb5_free_data_contents(context, &salt);
@@ -296,7 +290,7 @@ add_princ(context, str_newprinc)
goto error;
}
- if ((retval = krb5_dbekd_encrypt_key_data(context,&master_encblock,
+ if ((retval = krb5_dbekd_encrypt_key_data(context,&master_keyblock,
&key, NULL, 1,
newentry.key_data))) {
com_err(progname, retval, "while encrypting key for '%s'",
@@ -357,8 +351,10 @@ char *dbname;
com_err(pname, retval, "while calculated master key salt");
return(1);
}
- if ((retval = krb5_string_to_key(test_context, &master_encblock,
- &master_keyblock, &pwd, &scratch))) {
+ if ((retval = krb5_c_string_to_key(test_context,
+ master_keyblock.enctype,
+ &pwd, &scratch,
+ &master_keyblock))) {
com_err(pname, retval,
"while transforming master key from password");
return(1);
@@ -366,7 +362,7 @@ char *dbname;
free(scratch.data);
} else {
if ((retval = krb5_db_fetch_mkey(test_context, master_princ,
- &master_encblock, manual_mkey,
+ master_keyblock.enctype, manual_mkey,
FALSE, 0, NULL, &master_keyblock))) {
com_err(pname, retval, "while reading master key");
return(1);
@@ -377,7 +373,7 @@ char *dbname;
return(1);
}
if ((retval = krb5_db_verify_master_key(test_context, master_princ,
- &master_keyblock, &master_encblock))){
+ &master_keyblock))){
com_err(pname, retval, "while verifying master key");
(void) krb5_db_fini(test_context);
return(1);
@@ -399,20 +395,6 @@ char *dbname;
return(1);
}
- if ((retval = krb5_process_key(test_context,
- &master_encblock, &master_keyblock))) {
- com_err(pname, retval, "while processing master key");
- (void) krb5_db_fini(test_context);
- return(1);
- }
- if ((retval = krb5_init_random_key(test_context,
- &master_encblock, &master_keyblock,
- &master_random))) {
- com_err(pname, retval, "while initializing random key generator");
- krb5_finish_key(test_context, &master_encblock);
- (void) krb5_db_fini(test_context);
- return(1);
- }
mblock.max_life = master_entry.max_life;
mblock.max_rlife = master_entry.max_renewable_life;
mblock.expiration = master_entry.expiration;
diff --git a/src/tests/misc/test_nfold.c b/src/tests/misc/test_nfold.c
new file mode 100644
index 0000000000..78b5866185
--- /dev/null
+++ b/src/tests/misc/test_nfold.c
@@ -0,0 +1,65 @@
+/*
+ * 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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int main(int argc, char *argv[])
+{
+ int inlen, outlen, i;
+ unsigned char *instr, *outstr;
+
+ if (argc != 3) {
+ fprintf(stderr, "%s: instr outlen\n", argv[0]);
+ exit(1);
+ }
+
+ instr = (unsigned char *) argv[1];
+ inlen = strlen(instr)*8;
+ outlen = atoi(argv[2]);
+ if (outlen%8) {
+ fprintf(stderr, "outlen must be a multiple of 8\n");
+ exit(1);
+ }
+
+ if ((outstr = (unsigned char *) malloc(outlen/8)) == NULL) {
+ fprintf(stderr, "ENOMEM\n");
+ exit(1);
+ }
+
+ krb5_nfold(inlen,instr,outlen,outstr);
+
+ printf("%d-fold(",outlen);
+ for (i=0; i<(inlen/8); i++)
+ printf("%02x",instr[i]);
+ printf(") = ");
+ for (i=0; i<(outlen/8); i++)
+ printf("%02x",outstr[i]);
+ printf("\n");
+
+ exit(0);
+}
diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog
index 12fb1f93b5..7f4aaf5a53 100644
--- a/src/tests/verify/ChangeLog
+++ b/src/tests/verify/ChangeLog
@@ -1,3 +1,7 @@
+1998-10-27 Marc Horowitz <marc@mit.edu>
+
+ * kdb5_verify.c: update to new crypto api
+
1998-05-06 Theodore Ts'o <tytso@rsts-11.mit.edu>
* kdb5_verify.c (argv): POSIX states that getopt returns -1
diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c
index 8a95d7125e..558ef25335 100644
--- a/src/tests/verify/kdb5_verify.c
+++ b/src/tests/verify/kdb5_verify.c
@@ -272,7 +272,7 @@ check_princ(context, str_princ)
goto errout;
}
- if ((retval = krb5_dbekd_decrypt_key_data(context, &master_encblock,
+ if ((retval = krb5_dbekd_decrypt_key_data(context, &master_keyblock,
kdbe.key_data, &db_key, NULL))) {
com_err(progname, retval, "while decrypting key for '%s'", princ_name);
goto errout;
@@ -386,7 +386,8 @@ set_dbname_help(context, pname, dbname)
}
free(scratch.data);
} else {
- if ((retval = krb5_db_fetch_mkey(context, master_princ, &master_encblock,
+ if ((retval = krb5_db_fetch_mkey(context, master_princ,
+ master_keyblock.enctype,
manual_mkey, FALSE, (char *) NULL, 0,
&master_keyblock))) {
com_err(pname, retval, "while reading master key");
@@ -398,8 +399,7 @@ set_dbname_help(context, pname, dbname)
return(1);
}
if ((retval = krb5_db_verify_master_key(context, master_princ,
- &master_keyblock,
- &master_encblock))) {
+ &master_keyblock))) {
com_err(pname, retval, "while verifying master key");
(void) krb5_db_fini(context);
return(1);
generated by cgit (git 2.34.1) at 2024-10-01 07:14:17 +0000