SOURCES: nfs-utils-1.0.8-CITI_NFS4_ALL-2.dif (NEW) http://www.citi...

areq areq at pld-linux.org
Sun Jun 11 01:58:59 CEST 2006


Author: areq                         Date: Sat Jun 10 23:58:59 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/1.0.8-2/nfs-utils-1.0.8-CITI_NFS4_ALL-2.dif

---- Files affected:
SOURCES:
   nfs-utils-1.0.8-CITI_NFS4_ALL-2.dif (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/nfs-utils-1.0.8-CITI_NFS4_ALL-2.dif
diff -u /dev/null SOURCES/nfs-utils-1.0.8-CITI_NFS4_ALL-2.dif:1.1
--- /dev/null	Sun Jun 11 01:58:59 2006
+++ SOURCES/nfs-utils-1.0.8-CITI_NFS4_ALL-2.dif	Sun Jun 11 01:58:54 2006
@@ -0,0 +1,1220 @@
+
+
+The complete set of CITI nfs-utils patches rolled into one patch.
+
+Changes since 1.0.8-CITI_NFS4_ALL-1:
+
+ * Modify the printerr() function to:
+   - be more efficient
+   - use a single buffer rather than two
+   - not completely toss messages that are too long
+   - stop printing messages to syslog DEBUG level
+ 
+ * Change the default buffer size in readline function.  We are
+   passing much larger messages than it was written to expect.
+   This saves many calls to realloc() to resize the buffer.
+
+ * Use the correct definition of mech_used in the gss context and use
+   a u_int rather than size_t in calculations.  These fix problems on
+   64-bit big-endian machines.
+
+
+---
+
+ nfs-utils-1.0.8-kwc/utils/gssd/cacheio.c      |   18 
+ nfs-utils-1.0.8-kwc/utils/gssd/context_mit.c  |  511 ++++++++++++++++++++++++--
+ nfs-utils-1.0.8-kwc/utils/gssd/err_util.c     |   61 +--
+ nfs-utils-1.0.8-kwc/utils/gssd/gss_util.c     |   25 +
+ nfs-utils-1.0.8-kwc/utils/gssd/gss_util.h     |    1 
+ nfs-utils-1.0.8-kwc/utils/gssd/gssd.c         |    5 
+ nfs-utils-1.0.8-kwc/utils/gssd/krb5_util.c    |  221 ++++++++---
+ nfs-utils-1.0.8-kwc/utils/gssd/krb5_util.h    |    2 
+ nfs-utils-1.0.8-kwc/utils/gssd/svcgssd.c      |    5 
+ nfs-utils-1.0.8-kwc/utils/gssd/svcgssd_proc.c |   19 
+ nfs-utils-1.0.8-kwc/utils/gssd/write_bytes.h  |   15 
+ 11 files changed, 761 insertions(+), 122 deletions(-)
+
+diff -puN utils/gssd/err_util.c~CITI_NFS4_ALL utils/gssd/err_util.c
+--- nfs-utils-1.0.8/utils/gssd/err_util.c~CITI_NFS4_ALL	2006-05-26 11:03:04.202437000 -0400
++++ nfs-utils-1.0.8-kwc/utils/gssd/err_util.c	2006-05-26 11:03:04.293437000 -0400
+@@ -38,7 +38,6 @@ static int verbosity = 0;
+ static int fg = 0;
+ 
+ static char message_buf[500];
+-static char tmp_buf[500];
+ 
+ void initerr(char *progname, int set_verbosity, int set_fg)
+ {
+@@ -48,45 +47,47 @@ void initerr(char *progname, int set_ver
+ 		openlog(progname, LOG_PID, LOG_DAEMON);
+ }
+ 
++
+ void printerr(int priority, char *format, ...)
+ {
+ 	va_list args;
+ 	int ret;
++	int buf_used, buf_available;
++	char *buf;
++
++	/* Don't bother formatting a message we're never going to print! */
++	if (priority > verbosity)
++		return;
++
++	buf_used = strlen(message_buf);
++	/* subtract 4 to leave room for "...\n" if necessary */
++	buf_available = sizeof(message_buf) - buf_used - 4;
++	buf = message_buf + buf_used;
+ 
+-	/* aggregate lines: only print buffer when we get to the end of a
+-	 * line or run out of space: */
++	/*
++	 * Aggregate lines: only print buffer when we get to the
++	 * end of a line or run out of space
++	 */
+ 	va_start(args, format);
+-	ret = vsnprintf(tmp_buf, sizeof(tmp_buf), format, args);
++	ret = vsnprintf(buf, buf_available, format, args);
+ 	va_end(args);
+-	if ((ret < 0) || (ret >= sizeof(tmp_buf)))
+-		goto output;
+-	if (strlen(tmp_buf) + strlen(message_buf) + 1 > sizeof(message_buf))
+-			goto output;
+-	strcat(message_buf, tmp_buf);
+-	if (tmp_buf[strlen(tmp_buf) - 1] == '\n')
+-		goto output;
++
++	if (ret < 0)
++		goto printit;
++	if (ret >= buf_available) {
++		/* Indicate we're truncating */
++		strcat(message_buf, "...\n");
++		goto printit;
++	}
++	if (message_buf[strlen(message_buf) - 1] == '\n')
++		goto printit;
+ 	return;
+-output:
+-	priority -= verbosity;
+-	if (priority < 0)
+-		priority = 0;
++printit:
+ 	if (fg) {
+-		if (priority == 0)
+-			fprintf(stderr, "%s", message_buf);
++		fprintf(stderr, "%s", message_buf);
+ 	} else {
+-		int sys_pri;
+-		switch (priority) {
+-			case 0:
+-				sys_pri = LOG_ERR;
+-				break;
+-			case 1:
+-				sys_pri = LOG_DEBUG;
+-				break;
+-			default:
+-				goto out;
+-		}
+-		syslog(sys_pri, "%s", message_buf);
++		syslog(LOG_ERR, "%s", message_buf);
+ 	}
+-out:
++	/* reset the buffer */
+ 	memset(message_buf, 0, sizeof(message_buf));
+ }
+diff -puN utils/gssd/gssd.c~CITI_NFS4_ALL utils/gssd/gssd.c
+--- nfs-utils-1.0.8/utils/gssd/gssd.c~CITI_NFS4_ALL	2006-05-26 11:03:05.185986000 -0400
++++ nfs-utils-1.0.8-kwc/utils/gssd/gssd.c	2006-05-26 11:03:12.251831000 -0400
+@@ -145,6 +145,9 @@ main(int argc, char *argv[])
+ 			    "support setting debug level\n");
+ #endif
+ 
++	if (gssd_check_mechs() != 0)
++		errx(1, "Problem with gssapi library");
++
+ 	if (!fg && daemon(0, 0) < 0)
+ 		errx(1, "fork");
+ 
+@@ -154,6 +157,8 @@ main(int argc, char *argv[])
+ 
+ 	/* Process keytab file and get machine credentials */
+ 	gssd_refresh_krb5_machine_creds();
++	/* Determine Kerberos information from the kernel */
++	gssd_obtain_kernel_krb5_info();
+ 
+ 	gssd_run();
+ 	printerr(0, "gssd_run returned!\n");
+diff -puN utils/gssd/gss_util.c~CITI_NFS4_ALL utils/gssd/gss_util.c
+--- nfs-utils-1.0.8/utils/gssd/gss_util.c~CITI_NFS4_ALL	2006-05-26 11:03:06.223535000 -0400
++++ nfs-utils-1.0.8-kwc/utils/gssd/gss_util.c	2006-05-26 11:03:09.526142000 -0400
+@@ -224,3 +224,28 @@ gssd_acquire_cred(char *server_name)
+ 
+ 	return (maj_stat == GSS_S_COMPLETE);
+ }
++
++int gssd_check_mechs(void)
++{
++	u_int32_t maj_stat, min_stat;
++	gss_OID_set supported_mechs = GSS_C_NO_OID_SET;
++	int retval = -1;
++
++	maj_stat = gss_indicate_mechs(&min_stat, &supported_mechs);
++	if (maj_stat != GSS_S_COMPLETE) {
++		printerr(0, "Unable to obtain list of supported mechanisms. "
++			 "Check that gss library is properly configured.\n");
++		goto out;
++	}
++	if (supported_mechs == GSS_C_NO_OID_SET ||
++	    supported_mechs->count == 0) {
++		printerr(0, "Unable to obtain list of supported mechanisms. "
++			 "Check that gss library is properly configured.\n");
++		goto out;
++	}
++	maj_stat = gss_release_oid_set(&min_stat, &supported_mechs);
++	retval = 0;
++out:
++	return retval;
++}
++
+diff -puN utils/gssd/gss_util.h~CITI_NFS4_ALL utils/gssd/gss_util.h
+--- nfs-utils-1.0.8/utils/gssd/gss_util.h~CITI_NFS4_ALL	2006-05-26 11:03:07.460084000 -0400
++++ nfs-utils-1.0.8-kwc/utils/gssd/gss_util.h	2006-05-26 11:03:09.576071000 -0400
+@@ -40,5 +40,6 @@ extern gss_cred_id_t	gssd_creds;
+ int gssd_acquire_cred(char *server_name);
+ void pgsserr(char *msg, u_int32_t maj_stat, u_int32_t min_stat,
+ 	const gss_OID mech);
++int gssd_check_mechs(void);
+ 
+ #endif /* _GSS_UTIL_H_ */
+diff -puN utils/gssd/svcgssd.c~CITI_NFS4_ALL utils/gssd/svcgssd.c
+--- nfs-utils-1.0.8/utils/gssd/svcgssd.c~CITI_NFS4_ALL	2006-05-26 11:03:07.760787000 -0400
++++ nfs-utils-1.0.8-kwc/utils/gssd/svcgssd.c	2006-05-26 11:03:09.641006000 -0400
+@@ -204,6 +204,11 @@ main(int argc, char *argv[])
+ 			    "support setting debug level\n");
+ #endif
+ 
++	if (gssd_check_mechs() != 0) {
++		printerr(0, "ERROR: Problem with gssapi library\n");
++		exit(1);
++	}
++
+ 	if (!fg)
+ 		mydaemon(0, 0);
+ 
+diff -puN utils/gssd/krb5_util.c~CITI_NFS4_ALL utils/gssd/krb5_util.c
+--- nfs-utils-1.0.8/utils/gssd/krb5_util.c~CITI_NFS4_ALL	2006-05-26 11:03:10.902294000 -0400
++++ nfs-utils-1.0.8-kwc/utils/gssd/krb5_util.c	2006-05-26 11:03:12.451829000 -0400
+@@ -97,6 +97,7 @@
+ #include "config.h"
+ #include <sys/param.h>
+ #include <rpc/rpc.h>
++#include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+@@ -105,6 +106,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <dirent.h>
++#include <fcntl.h>
+ #include <errno.h>
+ #include <time.h>
+ #include <gssapi/gssapi.h>
+@@ -123,6 +125,10 @@
+ /* Global list of principals/cache file names for machine credentials */
+ struct gssd_k5_kt_princ *gssd_k5_kt_princ_list = NULL;
+ 
++/* Encryption types supported by the kernel rpcsec_gss code */
++int num_krb5_enctypes = 0;
++krb5_enctype *krb5_enctypes = NULL;
++
+ /*==========================*/
+ /*===  Internal routines ===*/
+ /*==========================*/
+@@ -261,51 +267,6 @@ gssd_find_existing_krb5_ccache(uid_t uid
+ }
+ 
+ 
+-#ifdef HAVE_SET_ALLOWABLE_ENCTYPES
+-/*
+- * this routine obtains a credentials handle via gss_acquire_cred()
+- * then calls gss_krb5_set_allowable_enctypes() to limit the encryption
+- * types negotiated.
+- *
+- * XXX Should call some function to determine the enctypes supported
+- * by the kernel. (Only need to do that once!)
+- *
+- * Returns:
+- *	0 => all went well
+- *     -1 => there was an error
+- */
+-
+-int
+-limit_krb5_enctypes(struct rpc_gss_sec *sec, uid_t uid)
+-{
+-	u_int maj_stat, min_stat;
+-	gss_cred_id_t credh;
+-	krb5_enctype enctypes[] = { ENCTYPE_DES_CBC_CRC };
+-	int num_enctypes = sizeof(enctypes) / sizeof(enctypes[0]);
+-
+-	maj_stat = gss_acquire_cred(&min_stat, NULL, 0,
+-				    GSS_C_NULL_OID_SET, GSS_C_INITIATE,
+-				    &credh, NULL, NULL);
+-
+-	if (maj_stat != GSS_S_COMPLETE) {
+-		pgsserr("gss_acquire_cred",
+-			maj_stat, min_stat, &krb5oid);
+-		return -1;
+-	}
+-
+-	maj_stat = gss_set_allowable_enctypes(&min_stat, credh, &krb5oid,
+-					     num_enctypes, &enctypes);
+-	if (maj_stat != GSS_S_COMPLETE) {
+-		pgsserr("gss_set_allowable_enctypes",
+-			maj_stat, min_stat, &krb5oid);
+-		return -1;
+-	}
+-	sec->cred = credh;
+-
+-	return 0;
+-}
+-#endif	/* HAVE_SET_ALLOWABLE_ENCTYPES */
+-
+ /*
+  * Obtain credentials via a key in the keytab given
+  * a keytab handle and a gssd_k5_kt_princ structure.
+@@ -603,6 +564,56 @@ gssd_set_krb5_ccache_name(char *ccname)
+ #endif
+ }
+ 
++/*
++ * Parse the supported encryption type information
++ */
++static int
++parse_enctypes(char *enctypes)
++{
++	int n = 0;
++	char *curr, *comma;
++	int i;
++
++	/* Just in case this ever gets called more than once */
++	if (krb5_enctypes != NULL) {
++		free(krb5_enctypes);
++		krb5_enctypes = NULL;
++		num_krb5_enctypes = 0;
++	}
++
++	/* count the number of commas */
++	for (curr = enctypes; curr && *curr != '\0'; curr = ++comma) {
++		comma = strchr(curr, ',');
++		if (comma != NULL)
++			n++;
++		else
++			break;
++	}
++	/* If no more commas and we're not at the end, there's one more value */
++	if (*curr != '\0')
++		n++;
++
++	/* Empty string, return an error */
++	if (n == 0)
++		return ENOENT;
++
++	/* Allocate space for enctypes array */
++	if ((krb5_enctypes = (int *) calloc(n, sizeof(int))) == NULL) {
++		return ENOMEM;
++	}
++
++	/* Now parse each value into the array */
++	for (curr = enctypes, i = 0; curr && *curr != '\0'; curr = ++comma) {
++		krb5_enctypes[i++] = atoi(curr);
++		comma = strchr(curr, ',');
++		if (comma == NULL)
++			break;
++	}
++
++	num_krb5_enctypes = n;
++	return 0;
++}
++
+ /*==========================*/
+ /*===  External routines ===*/
+ /*==========================*/
+@@ -854,3 +865,123 @@ gssd_destroy_krb5_machine_creds(void)
+ 	krb5_free_context(context);
+ }
+ 
++#ifdef HAVE_SET_ALLOWABLE_ENCTYPES
++/*
++ * this routine obtains a credentials handle via gss_acquire_cred()
++ * then calls gss_krb5_set_allowable_enctypes() to limit the encryption
++ * types negotiated.
++ *
++ * Returns:
++ *	0 => all went well
++ *     -1 => there was an error
++ */
++
++int
++limit_krb5_enctypes(struct rpc_gss_sec *sec, uid_t uid)
++{
++	u_int maj_stat, min_stat;
++	gss_cred_id_t credh;
++	gss_OID_set_desc  desired_mechs;
++	krb5_enctype enctypes[] = {ENCTYPE_DES_CBC_CRC};
++	int num_enctypes = sizeof(enctypes) / sizeof(enctypes[0]);
++
++	/* We only care about getting a krb5 cred */
++	desired_mechs.count = 1;
++	desired_mechs.elements = &krb5oid;
++
++	maj_stat = gss_acquire_cred(&min_stat, NULL, 0,
++				    &desired_mechs, GSS_C_INITIATE,
++				    &credh, NULL, NULL);
++
++	if (maj_stat != GSS_S_COMPLETE) {
++		pgsserr("gss_acquire_cred",
++			maj_stat, min_stat, &krb5oid);
++		return -1;
++	}
++
++	/*
++	 * If we failed for any reason to produce global
++	 * list of supported enctypes, use local default here.
++	 */
++	if (krb5_enctypes == NULL)
++		maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
++					&krb5oid, num_enctypes, &enctypes);
++	else
++		maj_stat = gss_set_allowable_enctypes(&min_stat, credh,
++					&krb5oid, num_krb5_enctypes,
++					krb5_enctypes);
++	if (maj_stat != GSS_S_COMPLETE) {
++		pgsserr("gss_set_allowable_enctypes",
++			maj_stat, min_stat, &krb5oid);
++		return -1;
++	}
++	sec->cred = credh;
++
++	return 0;
++}
++#endif	/* HAVE_SET_ALLOWABLE_ENCTYPES */
++
++/*
++ * Obtain supported enctypes from kernel.
++ * Set defaults if info is not available.
++ */
++void
++gssd_obtain_kernel_krb5_info(void)
++{
++	char enctype_file_name[128];
++	char buf[1024];
++	char enctypes[128];
++	char extrainfo[1024];
++	int fd;
++	int use_default_enctypes = 0;
++	int nbytes, numfields;
++	char default_enctypes[] = "1,3,2";
++	int code;
++
++	snprintf(enctype_file_name, sizeof(enctype_file_name),
++		 "%s/%s", pipefsdir, "krb5_info");
++
++	if ((fd = open(enctype_file_name, O_RDONLY)) == -1) {
++		printerr(1, "WARNING: gssd_obtain_kernel_krb5_info: "
++			 "Unable to open '%s'. Unable to determine "
++			 "Kerberos encryption types supported by the "
++			 "kernel; using defaults (%s).\n",
++			 enctype_file_name, default_enctypes);
++		use_default_enctypes = 1;
++		goto do_the_parse;
++	}
++	if ((nbytes = read(fd, buf, sizeof(buf))) == -1) {
++		printerr(0, "WARNING: gssd_obtain_kernel_krb5_info: "
++			 "Error reading Kerberos encryption type "
++			 "information file '%s'; using defaults (%s).\n",
++			 enctype_file_name, default_enctypes);
++		use_default_enctypes = 1;
++		goto do_the_parse;
++	}
++	numfields = sscanf(buf, "enctypes: %s\n%s", enctypes, extrainfo);
++	if (numfields < 1) {
++		printerr(0, "WARNING: gssd_obtain_kernel_krb5_info: "
++			 "error parsing Kerberos encryption type "
++			 "information from file '%s'; using defaults (%s).\n",
++			 enctype_file_name, default_enctypes);
++		use_default_enctypes = 1;
++		goto do_the_parse;
++	}
++	if (numfields > 1) {
++		printerr(0, "WARNING: gssd_obtain_kernel_krb5_info: "
++			 "Extra information, '%s', from '%s' is ignored\n",
++			 enctype_file_name, extrainfo);
++		use_default_enctypes = 1;
++		goto do_the_parse;
++	}
++  do_the_parse:
++  	if (use_default_enctypes)
++		strcpy(enctypes, default_enctypes);
++
++	if ((code = parse_enctypes(enctypes)) != 0) {
++		printerr(0, "ERROR: gssd_obtain_kernel_krb5_info: "
++			 "parse_enctypes%s failed with code %d\n",
++			 use_default_enctypes ? " (with default enctypes)" : "",
++			 code);
++	}
++}
+diff -puN utils/gssd/krb5_util.h~CITI_NFS4_ALL utils/gssd/krb5_util.h
+--- nfs-utils-1.0.8/utils/gssd/krb5_util.h~CITI_NFS4_ALL	2006-05-26 11:03:12.147829000 -0400
++++ nfs-utils-1.0.8-kwc/utils/gssd/krb5_util.h	2006-05-26 11:03:12.498797000 -0400
+@@ -22,6 +22,8 @@ int  gssd_refresh_krb5_machine_creds(voi
+ void gssd_free_krb5_machine_cred_list(char **list);
+ void gssd_setup_krb5_machine_gss_ccache(char *servername);
+ void gssd_destroy_krb5_machine_creds(void);
++void gssd_obtain_kernel_krb5_info(void);
++
+ 
+ #ifdef HAVE_SET_ALLOWABLE_ENCTYPES
+ int limit_krb5_enctypes(struct rpc_gss_sec *sec, uid_t uid);
+diff -puN utils/gssd/context_mit.c~CITI_NFS4_ALL utils/gssd/context_mit.c
+--- nfs-utils-1.0.8/utils/gssd/context_mit.c~CITI_NFS4_ALL	2006-05-26 11:03:13.029378000 -0400
++++ nfs-utils-1.0.8-kwc/utils/gssd/context_mit.c	2006-05-26 11:03:14.045927000 -0400
+@@ -32,6 +32,7 @@
+ #include <stdio.h>
+ #include <syslog.h>
+ #include <string.h>
++#include <errno.h>
+ #include <gssapi.h>
+ #include <rpc/rpc.h>
+ #include <rpc/auth_gss.h>
+@@ -43,9 +44,53 @@
+ #ifdef HAVE_KRB5
+ #include <krb5.h>
+ 
++/* for 3DES */
++#define KG_USAGE_SEAL 22
++#define KG_USAGE_SIGN 23
++#define KG_USAGE_SEQ  24
++
++/* for rfc???? */
++#define KG_USAGE_ACCEPTOR_SEAL  22
++#define KG_USAGE_ACCEPTOR_SIGN  23
++#define KG_USAGE_INITIATOR_SEAL 24
++#define KG_USAGE_INITIATOR_SIGN 25
++
++/* Lifted from mit src/lib/gssapi/krb5/gssapiP_krb5.h */
++enum seal_alg {
++  SEAL_ALG_NONE            = 0xffff,
++  SEAL_ALG_DES             = 0x0000,
++  SEAL_ALG_1               = 0x0001, /* not published */
++  SEAL_ALG_MICROSOFT_RC4   = 0x0010, /* microsoft w2k;  */
++  SEAL_ALG_DES3KD          = 0x0002
++};
++
++#define KEY_USAGE_SEED_ENCRYPTION	0xAA
++#define KEY_USAGE_SEED_INTEGRITY	0x55
++#define KEY_USAGE_SEED_CHECKSUM		0x99
++#define K5CLENGTH 5
++
++/* Flags for version 2 context flags */
++#define KRB5_CTX_FLAG_INITIATOR		0x00000001
++#define KRB5_CTX_FLAG_CFX		0x00000002
++#define KRB5_CTX_FLAG_ACCEPTOR_SUBKEY	0x00000004
++
++/*
++ * XXX Hack alert.  We don't have "legal" access to these
++ * structures located in libk5crypto
++ */
++extern void krb5int_enc_arcfour;
++extern void krb5int_enc_des3;
++extern void krb5int_enc_aes128;
++extern void krb5int_enc_aes256;
++extern int krb5_derive_key();
++
++void *get_enc_provider();
++
+ /* XXX spkm3 seems to actually want it this big, yipes. */
+ #define MAX_CTX_LEN 4096
+ 
++
++
+ #ifdef HAVE_LUCID_CONTEXT_SUPPORT
+ 
+ /* Don't use the private structure, use the exported lucid structure */
+@@ -86,7 +131,7 @@ typedef struct _krb5_gss_ctx_id_rec {
+    uint64_t seq_recv;		/* gssint_uint64 */
+    void *seqstate;
+    krb5_auth_context auth_context;
+-   gss_buffer_desc *mech_used;	/* gss_OID_desc */
++   gss_OID_desc *mech_used;	/* gss_OID_desc */
+     /* Protocol spec revision
+        0 => RFC 1964 with 3DES and RC4 enhancements
+        1 => draft-ietf-krb-wg-gssapi-cfx-01
+@@ -123,7 +168,7 @@ typedef struct _krb5_gss_ctx_id_rec {
+ 	int established;
+ 	int big_endian;
+ 	krb5_auth_context auth_context;
+-	gss_buffer_desc *mech_used;
++	gss_OID_desc *mech_used;
+ 	int nctypes;
+ 	krb5_cksumtype *ctypes;
+ } krb5_gss_ctx_id_rec, *krb5_gss_ctx_id_t;
+@@ -144,6 +189,96 @@ write_lucid_keyblock(char **p, char *end
+ 	return 0;
+ }
+ 
++static void
++key_lucid_to_krb5(const gss_krb5_lucid_key_t *lin, krb5_keyblock *kout)
++{
++	memset(kout, '\0', sizeof(kout));
++	kout->enctype = lin->type;
++	kout->length = lin->length;
++	kout->contents = lin->data;
++}
++
++static void
++key_krb5_to_lucid(const krb5_keyblock *kin, gss_krb5_lucid_key_t *lout)
++{
++	memset(lout, '\0', sizeof(lout));
++	lout->type = kin->enctype;
++	lout->length = kin->length;
++	lout->data = kin->contents;
++}
++
++/*
++ * Function to derive a new key from a given key and given constant data.
++ */
++static krb5_error_code
++derive_key_lucid(const gss_krb5_lucid_key_t *in, gss_krb5_lucid_key_t *out,
++		 int usage, char extra)
++{
++	krb5_error_code code;
<<Diff was trimmed, longer than 597 lines>>


More information about the pld-cvs-commit mailing list