svn rev #25227: trunk/src/ include/ kdc/ lib/krb5/krb/ plugins/preauth/encrypted_challenge/
ghudson@MIT.EDU
ghudson at MIT.EDU
Fri Sep 23 10:35:34 EDT 2011
http://src.mit.edu/fisheye/changelog/krb5/?cs=25227
Commit By: ghudson
Log Message:
Recast encrypted challenge as linked built-ins.
Since it has no external dependencies, split up encrypted preauth into
clpreauth and kdcpreauth chunks and link them directly into the
consumers.
Changed Files:
U trunk/src/Makefile.in
U trunk/src/configure.in
A trunk/src/include/fast_factor.h
U trunk/src/kdc/Makefile.in
U trunk/src/kdc/kdc_preauth.c
A trunk/src/kdc/kdc_preauth_ec.c
U trunk/src/kdc/kdc_util.h
U trunk/src/lib/krb5/krb/Makefile.in
U trunk/src/lib/krb5/krb/int-proto.h
U trunk/src/lib/krb5/krb/preauth2.c
A trunk/src/lib/krb5/krb/preauth_ec.c
D trunk/src/plugins/preauth/encrypted_challenge/Makefile.in
D trunk/src/plugins/preauth/encrypted_challenge/deps
D trunk/src/plugins/preauth/encrypted_challenge/encrypted_challenge.exports
D trunk/src/plugins/preauth/encrypted_challenge/encrypted_challenge_main.c
Modified: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in 2011-09-22 18:09:45 UTC (rev 25226)
+++ trunk/src/Makefile.in 2011-09-23 14:35:34 UTC (rev 25227)
@@ -13,7 +13,6 @@
plugins/kdb/db2 \
@ldap_plugin_dir@ \
plugins/preauth/pkinit \
- plugins/preauth/encrypted_challenge \
kdc kadmin slave clients appl tests \
config-files gen-manpages @po@
WINSUBDIRS=include util lib ccapi windows clients appl
@@ -89,7 +88,6 @@
(w=`pwd`; cd util && $(MAKE) install DESTDIR="$$w/util/fakedest")
(w=`pwd`; cd lib && $(MAKE) install DESTDIR="$$w/util/fakedest")
(w=`pwd`; cd plugins/kdb/db2 && $(MAKE) install DESTDIR="$$w/util/fakedest")
- (w=`pwd`; cd plugins/preauth/encrypted_challenge && $(MAKE) install DESTDIR="$$w/util/fakedest")
if test -r plugins/preauth/pkinit/Makefile; then \
(w=`pwd`; cd plugins/preauth/pkinit && $(MAKE) install DESTDIR="$$w/util/fakedest"); \
fi
Modified: trunk/src/configure.in
===================================================================
--- trunk/src/configure.in 2011-09-22 18:09:45 UTC (rev 25226)
+++ trunk/src/configure.in 2011-09-23 14:35:34 UTC (rev 25227)
@@ -1231,7 +1231,7 @@
plugins/kdb/db2/libdb2/recno
plugins/kdb/db2/libdb2/test
plugins/kdb/hdb
- plugins/preauth/cksum_body plugins/preauth/encrypted_challenge
+ plugins/preauth/cksum_body
plugins/preauth/securid_sam2
plugins/preauth/wpse
plugins/authdata/greet
Added: trunk/src/include/fast_factor.h
===================================================================
--- trunk/src/include/fast_factor.h (rev 0)
+++ trunk/src/include/fast_factor.h 2011-09-23 14:35:34 UTC (rev 25227)
@@ -0,0 +1,86 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* include/fast_factor.h - Convenience inline functions for FAST factors */
+/*
+ * Copyright (C) 2011 by the Massachusetts Institute of Technology.
+ * 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 M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission. Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose. It is provided "as is" without express
+ * or implied warranty.
+ */
+
+#ifndef FAST_FACTOR_H
+
+/*
+ * Returns success with a null armor_key if FAST is available but not in use.
+ * Returns failure if the client library does not support FAST.
+ */
+static inline krb5_error_code
+fast_get_armor_key(krb5_context context, krb5_clpreauth_get_data_fn get_data,
+ krb5_clpreauth_rock rock, krb5_keyblock **armor_key)
+{
+ krb5_error_code retval = 0;
+ krb5_data *data;
+ retval = get_data(context, rock, krb5_clpreauth_fast_armor, &data);
+ if (retval == 0) {
+ *armor_key = (krb5_keyblock *) data->data;
+ data->data = NULL;
+ get_data(context, rock, krb5_clpreauth_free_fast_armor, &data);
+ }
+ return retval;
+}
+
+static inline krb5_error_code
+fast_kdc_get_armor_key(krb5_context context,
+ krb5_kdcpreauth_get_data_fn get_entry,
+ krb5_kdc_req *request,
+ struct _krb5_db_entry_new *client,
+ krb5_keyblock **armor_key)
+{
+ krb5_error_code retval;
+ krb5_data *data;
+ retval = get_entry(context, request, client, krb5_kdcpreauth_fast_armor,
+ &data);
+ if (retval == 0) {
+ *armor_key = (krb5_keyblock *) data->data;
+ data->data = NULL;
+ get_entry(context, request, client,
+ krb5_kdcpreauth_free_fast_armor, &data);
+ }
+ return retval;
+}
+
+
+
+static inline krb5_error_code
+fast_kdc_replace_reply_key(krb5_context context,
+ krb5_kdcpreauth_get_data_fn get_data,
+ krb5_kdc_req *request)
+{
+ return 0;
+}
+
+static inline krb5_error_code
+fast_set_kdc_verified(krb5_context context,
+ krb5_clpreauth_get_data_fn get_data,
+ krb5_clpreauth_rock rock)
+{
+ return 0;
+}
+
+#endif /* FAST_FACTOR_H */
Modified: trunk/src/kdc/Makefile.in
===================================================================
--- trunk/src/kdc/Makefile.in 2011-09-22 18:09:45 UTC (rev 25226)
+++ trunk/src/kdc/Makefile.in 2011-09-23 14:35:34 UTC (rev 25227)
@@ -20,6 +20,7 @@
$(srcdir)/fast_util.c \
$(srcdir)/kdc_util.c \
$(srcdir)/kdc_preauth.c \
+ $(srcdir)/kdc_preauth_ec.c \
$(srcdir)/main.c \
$(srcdir)/policy.c \
$(srcdir)/extern.c \
@@ -34,6 +35,7 @@
fast_util.o \
kdc_util.o \
kdc_preauth.o \
+ kdc_preauth_ec.o \
main.o \
policy.o \
extern.o \
Modified: trunk/src/kdc/kdc_preauth.c
===================================================================
--- trunk/src/kdc/kdc_preauth.c 2011-09-22 18:09:45 UTC (rev 25226)
+++ trunk/src/kdc/kdc_preauth.c 2011-09-23 14:35:34 UTC (rev 25227)
@@ -318,11 +318,12 @@
*vtables_out = NULL;
*n_tables_out = *n_systems_out = 0;
- /* Auto-register pkinit and encrypted challenge if possible. */
+ /* Auto-register encrypted challenge and (if possible) pkinit. */
k5_plugin_register_dyn(context, PLUGIN_INTERFACE_KDCPREAUTH, "pkinit",
"preauth");
- k5_plugin_register_dyn(context, PLUGIN_INTERFACE_KDCPREAUTH,
- "encrypted_challenge", "preauth");
+ k5_plugin_register(context, PLUGIN_INTERFACE_KDCPREAUTH,
+ "encrypted_challenge",
+ kdcpreauth_encrypted_challenge_initvt);
if (k5_plugin_load_all(context, PLUGIN_INTERFACE_KDCPREAUTH, &plugins))
return;
Copied: trunk/src/kdc/kdc_preauth_ec.c (from rev 25226, trunk/src/plugins/preauth/encrypted_challenge/encrypted_challenge_main.c)
===================================================================
--- trunk/src/kdc/kdc_preauth_ec.c (rev 0)
+++ trunk/src/kdc/kdc_preauth_ec.c 2011-09-23 14:35:34 UTC (rev 25227)
@@ -0,0 +1,244 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* kdc/kdc_preauth_ec.c - Encrypted challenge kdcpreauth module */
+/*
+ * Copyright (C) 2009 by the Massachusetts Institute of Technology.
+ * 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 M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission. Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose. It is provided "as is" without express
+ * or implied warranty.
+ */
+
+/*
+ * Implement Encrypted Challenge fast factor from
+ * draft-ietf-krb-wg-preauth-framework
+ */
+
+#include <k5-int.h>
+#include <krb5/preauth_plugin.h>
+#include "fast_factor.h"
+#include "kdc_util.h"
+
+static krb5_error_code
+kdc_include_padata(krb5_context context, krb5_kdc_req *request,
+ struct _krb5_db_entry_new *client,
+ struct _krb5_db_entry_new *server,
+ krb5_kdcpreauth_get_data_fn get_data_proc,
+ krb5_kdcpreauth_moddata moddata, krb5_pa_data *data)
+{
+ krb5_error_code retval = 0;
+ krb5_keyblock *armor_key = NULL;
+ retval = fast_kdc_get_armor_key(context, get_data_proc, request, client,
+ &armor_key);
+ if (retval)
+ return retval;
+ if (armor_key == 0)
+ return ENOENT;
+ krb5_free_keyblock(context, armor_key);
+ return 0;
+}
+
+static krb5_error_code
+kdc_verify_preauth(krb5_context context, struct _krb5_db_entry_new *client,
+ krb5_data *req_pkt, krb5_kdc_req *request,
+ krb5_enc_tkt_part *enc_tkt_reply, krb5_pa_data *data,
+ krb5_kdcpreauth_get_data_fn get_entry_proc,
+ krb5_kdcpreauth_moddata moddata,
+ krb5_kdcpreauth_modreq *modreq_out,
+ krb5_data **e_data, krb5_authdata ***authz_data)
+{
+ krb5_error_code retval = 0;
+ krb5_timestamp now;
+ krb5_enc_data *enc = NULL;
+ krb5_data scratch, plain;
+ krb5_keyblock *armor_key = NULL;
+ krb5_pa_enc_ts *ts = NULL;
+ krb5int_access kaccess;
+ krb5_keyblock *client_keys = NULL;
+ krb5_data *client_data = NULL;
+ krb5_keyblock *challenge_key = NULL;
+ krb5_keyblock *kdc_challenge_key;
+ int i = 0;
+
+ plain.data = NULL;
+ if (krb5int_accessor(&kaccess, KRB5INT_ACCESS_VERSION) != 0)
+ return 0;
+
+ retval = fast_kdc_get_armor_key(context, get_entry_proc, request, client, &armor_key);
+ if (retval == 0 &&armor_key == NULL) {
+ retval = ENOENT;
+ krb5_set_error_message(context, ENOENT, "Encrypted Challenge used outside of FAST tunnel");
+ }
+ scratch.data = (char *) data->contents;
+ scratch.length = data->length;
+ if (retval == 0)
+ retval = kaccess.decode_enc_data(&scratch, &enc);
+ if (retval == 0) {
+ plain.data = malloc(enc->ciphertext.length);
+ plain.length = enc->ciphertext.length;
+ if (plain.data == NULL)
+ retval = ENOMEM;
+ }
+ if (retval == 0)
+ retval = get_entry_proc(context, request, client,
+ krb5_kdcpreauth_keys, &client_data);
+ if (retval == 0) {
+ client_keys = (krb5_keyblock *) client_data->data;
+ for (i = 0; client_keys[i].enctype&& (retval == 0); i++ ) {
+ retval = krb5_c_fx_cf2_simple(context,
+ armor_key, "clientchallengearmor",
+ &client_keys[i], "challengelongterm",
+ &challenge_key);
+ if (retval == 0)
+ retval = krb5_c_decrypt(context, challenge_key,
+ KRB5_KEYUSAGE_ENC_CHALLENGE_CLIENT,
+ NULL, enc, &plain);
+ if (challenge_key)
+ krb5_free_keyblock(context, challenge_key);
+ challenge_key = NULL;
+ if (retval == 0)
+ break;
+ /*We failed to decrypt. Try next key*/
+ retval = 0;
+ krb5_free_keyblock_contents(context, &client_keys[i]);
+ }
+ if (client_keys[i].enctype == 0) {
+ retval = KRB5KDC_ERR_PREAUTH_FAILED;
+ krb5_set_error_message(context, retval, "Incorrect password in encrypted challenge");
+ } else { /*not run out of keys*/
+ int j;
+ assert (retval == 0);
+ for (j = i+1; client_keys[j].enctype; j++)
+ krb5_free_keyblock_contents(context, &client_keys[j]);
+ }
+
+ }
+ if (retval == 0)
+ retval = kaccess.decode_enc_ts(&plain, &ts);
+ if (retval == 0)
+ retval = krb5_timeofday(context, &now);
+ if (retval == 0) {
+ if (labs(now-ts->patimestamp) < context->clockskew) {
+ enc_tkt_reply->flags |= TKT_FLG_PRE_AUTH;
+ /*
+ * If this fails, we won't generate a reply to the client. That
+ * may cause the client to fail, but at this point the KDC has
+ * considered this a success, so the return value is ignored.
+ */
+ fast_kdc_replace_reply_key(context, get_entry_proc, request);
+ if (krb5_c_fx_cf2_simple(context, armor_key, "kdcchallengearmor",
+ &client_keys[i], "challengelongterm",
+ &kdc_challenge_key) == 0)
+ *modreq_out = (krb5_kdcpreauth_modreq)kdc_challenge_key;
+ } else { /*skew*/
+ retval = KRB5KRB_AP_ERR_SKEW;
+ }
+ }
+ if (client_keys) {
+ if (client_keys[i].enctype)
+ krb5_free_keyblock_contents(context, &client_keys[i]);
+ krb5_free_data(context, client_data);
+ }
+ if (armor_key)
+ krb5_free_keyblock(context, armor_key);
+ if (plain.data)
+ free(plain.data);
+ if (enc)
+ kaccess.free_enc_data(context, enc);
+ if (ts)
+ kaccess.free_enc_ts(context, ts);
+ return retval;
+}
+
+static krb5_error_code
+kdc_return_preauth(krb5_context context, krb5_pa_data *padata,
+ struct _krb5_db_entry_new *client, krb5_data *req_pkt,
+ krb5_kdc_req *request, krb5_kdc_rep *reply,
+ struct _krb5_key_data *client_keys,
+ krb5_keyblock *encrypting_key, krb5_pa_data **send_pa,
+ krb5_kdcpreauth_get_data_fn get_entry_proc,
+ krb5_kdcpreauth_moddata moddata,
+ krb5_kdcpreauth_modreq modreq)
+{
+ krb5_error_code retval = 0;
+ krb5_keyblock *challenge_key = (krb5_keyblock *)modreq;
+ krb5_pa_enc_ts ts;
+ krb5_data *plain = NULL;
+ krb5_enc_data enc;
+ krb5_data *encoded = NULL;
+ krb5_pa_data *pa = NULL;
+ krb5int_access kaccess;
+
+ if (krb5int_accessor(&kaccess, KRB5INT_ACCESS_VERSION) != 0)
+ return 0;
+ if (challenge_key == NULL)
+ return 0;
+ enc.ciphertext.data = NULL; /* In case of error pass through */
+
+ retval = krb5_us_timeofday(context, &ts.patimestamp, &ts.pausec);
+ if (retval == 0)
+ retval = kaccess.encode_enc_ts(&ts, &plain);
+ if (retval == 0)
+ retval = kaccess.encrypt_helper(context, challenge_key,
+ KRB5_KEYUSAGE_ENC_CHALLENGE_KDC,
+ plain, &enc);
+ if (retval == 0)
+ retval = kaccess.encode_enc_data(&enc, &encoded);
+ if (retval == 0) {
+ pa = calloc(1, sizeof(krb5_pa_data));
+ if (pa == NULL)
+ retval = ENOMEM;
+ }
+ if (retval == 0) {
+ pa->pa_type = KRB5_PADATA_ENCRYPTED_CHALLENGE;
+ pa->contents = (unsigned char *) encoded->data;
+ pa->length = encoded->length;
+ encoded->data = NULL;
+ *send_pa = pa;
+ pa = NULL;
+ }
+ if (challenge_key)
+ krb5_free_keyblock(context, challenge_key);
+ if (encoded)
+ krb5_free_data(context, encoded);
+ if (plain)
+ krb5_free_data(context, plain);
+ if (enc.ciphertext.data)
+ krb5_free_data_contents(context, &enc.ciphertext);
+ return retval;
+}
+
+krb5_preauthtype supported_pa_types[] = {
+ KRB5_PADATA_ENCRYPTED_CHALLENGE, 0};
+
+krb5_error_code
+kdcpreauth_encrypted_challenge_initvt(krb5_context context, int maj_ver,
+ int min_ver, krb5_plugin_vtable vtable)
+{
+ krb5_kdcpreauth_vtable vt;
+
+ if (maj_ver != 1)
+ return KRB5_PLUGIN_VER_NOTSUPP;
+ vt = (krb5_kdcpreauth_vtable)vtable;
+ vt->name = "encrypted_challenge";
+ vt->pa_type_list = supported_pa_types;
+ vt->edata = kdc_include_padata;
+ vt->verify = kdc_verify_preauth;
+ vt->return_padata = kdc_return_preauth;
+ return 0;
+}
Modified: trunk/src/kdc/kdc_util.h
===================================================================
--- trunk/src/kdc/kdc_util.h 2011-09-22 18:09:45 UTC (rev 25226)
+++ trunk/src/kdc/kdc_util.h 2011-09-23 14:35:34 UTC (rev 25227)
@@ -201,6 +201,11 @@
krb5_pa_data ***out_padata,
krb5_boolean copy);
+/* kdc_preauth_ec.c */
+krb5_error_code
+kdcpreauth_encrypted_challenge_initvt(krb5_context context, int maj_ver,
+ int min_ver, krb5_plugin_vtable vtable);
+
/* kdc_authdata.c */
krb5_error_code
load_authdata_plugins(krb5_context context);
Modified: trunk/src/lib/krb5/krb/Makefile.in
===================================================================
--- trunk/src/lib/krb5/krb/Makefile.in 2011-09-22 18:09:45 UTC (rev 25226)
+++ trunk/src/lib/krb5/krb/Makefile.in 2011-09-23 14:35:34 UTC (rev 25227)
@@ -77,6 +77,7 @@
plugin.o \
pr_to_salt.o \
preauth2.o \
+ preauth_ec.o \
gic_opt_set_pa.o \
princ_comp.o \
privsafe.o \
@@ -180,6 +181,7 @@
$(OUTPRE)plugin.$(OBJEXT) \
$(OUTPRE)pr_to_salt.$(OBJEXT) \
$(OUTPRE)preauth2.$(OBJEXT) \
+ $(OUTPRE)preauth_ec.$(OBJEXT) \
$(OUTPRE)gic_opt_set_pa.$(OBJEXT) \
$(OUTPRE)princ_comp.$(OBJEXT) \
$(OUTPRE)privsafe.$(OBJEXT) \
@@ -283,6 +285,7 @@
$(srcdir)/plugin.c \
$(srcdir)/pr_to_salt.c \
$(srcdir)/preauth2.c \
+ $(srcdir)/preauth_ec.c \
$(srcdir)/gic_opt_set_pa.c \
$(srcdir)/princ_comp.c \
$(srcdir)/privsafe.c \
Modified: trunk/src/lib/krb5/krb/int-proto.h
===================================================================
--- trunk/src/lib/krb5/krb/int-proto.h 2011-09-22 18:09:45 UTC (rev 25226)
+++ trunk/src/lib/krb5/krb/int-proto.h 2011-09-23 14:35:34 UTC (rev 25227)
@@ -54,6 +54,10 @@
const char *value);
krb5_error_code
+clpreauth_encrypted_challenge_initvt(krb5_context context, int maj_ver,
+ int min_ver, krb5_plugin_vtable vtable);
+
+krb5_error_code
krb5int_construct_matching_creds(krb5_context context, krb5_flags options,
krb5_creds *in_creds, krb5_creds *mcreds,
krb5_flags *fields);
Modified: trunk/src/lib/krb5/krb/preauth2.c
===================================================================
--- trunk/src/lib/krb5/krb/preauth2.c 2011-09-22 18:09:45 UTC (rev 25226)
+++ trunk/src/lib/krb5/krb/preauth2.c 2011-09-23 14:35:34 UTC (rev 25227)
@@ -120,11 +120,12 @@
if (kcontext->preauth_context != NULL)
return;
- /* Auto-register pkinit and encrypted challenge if possible. */
+ /* Auto-register encrypted challenge and (if possible) pkinit. */
k5_plugin_register_dyn(kcontext, PLUGIN_INTERFACE_CLPREAUTH, "pkinit",
"preauth");
- k5_plugin_register_dyn(kcontext, PLUGIN_INTERFACE_CLPREAUTH,
- "encrypted_challenge", "preauth");
+ k5_plugin_register(kcontext, PLUGIN_INTERFACE_CLPREAUTH,
+ "encrypted_challenge",
+ clpreauth_encrypted_challenge_initvt);
/* Get all available clpreauth vtables. */
if (k5_plugin_load_all(kcontext, PLUGIN_INTERFACE_CLPREAUTH, &plugins))
Added: trunk/src/lib/krb5/krb/preauth_ec.c
===================================================================
--- trunk/src/lib/krb5/krb/preauth_ec.c (rev 0)
+++ trunk/src/lib/krb5/krb/preauth_ec.c 2011-09-23 14:35:34 UTC (rev 25227)
@@ -0,0 +1,189 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* lib/krb5/krb/preauth_ec.c - Encrypted Challenge clpreauth module */
+/*
+ * Copyright (C) 2009, 2011 by the Massachusetts Institute of Technology.
+ * 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 M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission. Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose. It is provided "as is" without express
+ * or implied warranty.
+ */
+
+/*
+ * Implement Encrypted Challenge fast factor from
+ * draft-ietf-krb-wg-preauth-framework
+ */
+
+#include <k5-int.h>
+#include <krb5/preauth_plugin.h>
+#include "fast_factor.h"
+#include "int-proto.h"
+
+static int
+preauth_flags(krb5_context context, krb5_preauthtype pa_type)
+{
+ return PA_REAL;
+}
+
+static krb5_error_code
+process_preauth(krb5_context context, krb5_clpreauth_moddata moddata,
+ krb5_clpreauth_modreq modreq, krb5_get_init_creds_opt *opt,
+ krb5_clpreauth_get_data_fn get_data_proc,
+ krb5_clpreauth_rock rock, krb5_kdc_req *request,
+ krb5_data *encoded_request_body,
+ krb5_data *encoded_previous_request, krb5_pa_data *padata,
+ krb5_prompter_fct prompter, void *prompter_data,
+ krb5_clpreauth_get_as_key_fn gak_fct, void *gak_data,
+ krb5_data *salt, krb5_data *s2kparams, krb5_keyblock *as_key,
+ krb5_pa_data ***out_padata)
+{
+ krb5_error_code retval = 0;
+ krb5_enctype enctype = 0;
+ krb5_keyblock *challenge_key = NULL, *armor_key = NULL;
+ krb5_data *etype_data = NULL;
+ krb5int_access kaccess;
+
+ if (krb5int_accessor(&kaccess, KRB5INT_ACCESS_VERSION) != 0)
+ return 0;
+ retval = fast_get_armor_key(context, get_data_proc, rock, &armor_key);
+ if (retval || armor_key == NULL)
+ return 0;
+ retval = get_data_proc(context, rock, krb5_clpreauth_get_etype,
+ &etype_data);
+ if (retval == 0) {
+ enctype = *((krb5_enctype *)etype_data->data);
+ if (as_key->length == 0 ||as_key->enctype != enctype)
+ retval = gak_fct(context, request->client,
+ enctype, prompter, prompter_data,
+ salt, s2kparams,
+ as_key, gak_data);
+ }
+ if (retval == 0 && padata->length) {
+ krb5_enc_data *enc = NULL;
+ krb5_data scratch;
+ scratch.length = padata->length;
+ scratch.data = (char *) padata->contents;
+ retval = krb5_c_fx_cf2_simple(context,armor_key, "kdcchallengearmor",
+ as_key, "challengelongterm",
+ &challenge_key);
+ if (retval == 0)
+ retval =kaccess.decode_enc_data(&scratch, &enc);
+ scratch.data = NULL;
+ if (retval == 0) {
+ scratch.data = malloc(enc->ciphertext.length);
+ scratch.length = enc->ciphertext.length;
+ if (scratch.data == NULL)
+ retval = ENOMEM;
+ }
+ if (retval == 0)
+ retval = krb5_c_decrypt(context, challenge_key,
+ KRB5_KEYUSAGE_ENC_CHALLENGE_KDC, NULL,
+ enc, &scratch);
+ /*
+ * Per draft 11 of the preauth framework, the client MAY but is not
+ * required to actually check the timestamp from the KDC other than to
+ * confirm it decrypts. This code does not perform that check.
+ */
+ if (scratch.data)
+ krb5_free_data_contents(context, &scratch);
+ if (retval == 0)
+ fast_set_kdc_verified(context, get_data_proc, rock);
+ if (enc)
+ kaccess.free_enc_data(context, enc);
+ } else if (retval == 0) { /*No padata; we send*/
+ krb5_enc_data enc;
+ krb5_pa_data *pa = NULL;
+ krb5_pa_data **pa_array = NULL;
+ krb5_data *encoded_ts = NULL;
+ krb5_pa_enc_ts ts;
+ enc.ciphertext.data = NULL;
+ retval = krb5_us_timeofday(context, &ts.patimestamp, &ts.pausec);
+ if (retval == 0)
+ retval = kaccess.encode_enc_ts(&ts, &encoded_ts);
+ if (retval == 0)
+ retval = krb5_c_fx_cf2_simple(context,
+ armor_key, "clientchallengearmor",
+ as_key, "challengelongterm",
+ &challenge_key);
+ if (retval == 0)
+ retval = kaccess.encrypt_helper(context, challenge_key,
+ KRB5_KEYUSAGE_ENC_CHALLENGE_CLIENT,
+ encoded_ts, &enc);
+ if (encoded_ts)
+ krb5_free_data(context, encoded_ts);
+ encoded_ts = NULL;
+ if (retval == 0) {
+ retval = kaccess.encode_enc_data(&enc, &encoded_ts);
+ krb5_free_data_contents(context, &enc.ciphertext);
+ }
+ if (retval == 0) {
+ pa = calloc(1, sizeof(krb5_pa_data));
+ if (pa == NULL)
+ retval = ENOMEM;
+ }
+ if (retval == 0) {
+ pa_array = calloc(2, sizeof(krb5_pa_data *));
+ if (pa_array == NULL)
+ retval = ENOMEM;
+ }
+ if (retval == 0) {
+ pa->length = encoded_ts->length;
+ pa->contents = (unsigned char *) encoded_ts->data;
+ pa->pa_type = KRB5_PADATA_ENCRYPTED_CHALLENGE;
+ free(encoded_ts);
+ encoded_ts = NULL;
+ pa_array[0] = pa;
+ pa = NULL;
+ *out_padata = pa_array;
+ pa_array = NULL;
+ }
+ if (pa)
+ free(pa);
+ if (encoded_ts)
+ krb5_free_data(context, encoded_ts);
+ if (pa_array)
+ free(pa_array);
+ }
+ if (challenge_key)
+ krb5_free_keyblock(context, challenge_key);
+ if (armor_key)
+ krb5_free_keyblock(context, armor_key);
+ if (etype_data != NULL)
+ get_data_proc(context, rock, krb5_clpreauth_free_etype, &etype_data);
+ return retval;
+}
+
+
+krb5_preauthtype supported_pa_types[] = {
+ KRB5_PADATA_ENCRYPTED_CHALLENGE, 0};
+
+krb5_error_code
+clpreauth_encrypted_challenge_initvt(krb5_context context, int maj_ver,
+ int min_ver, krb5_plugin_vtable vtable)
+{
+ krb5_clpreauth_vtable vt;
+
+ if (maj_ver != 1)
+ return KRB5_PLUGIN_VER_NOTSUPP;
+ vt = (krb5_clpreauth_vtable)vtable;
+ vt->name = "encrypted_challenge";
+ vt->pa_type_list = supported_pa_types;
+ vt->flags = preauth_flags;
+ vt->process = process_preauth;
+ return 0;
+}
More information about the cvs-krb5
mailing list