svn rev #23537: trunk/src/lib/crypto/krb/
tsitkova@MIT.EDU
tsitkova at MIT.EDU
Tue Dec 29 15:08:42 EST 2009
http://src.mit.edu/fisheye/changelog/krb5/?cs=23537
Commit By: tsitkova
Log Message:
Combine the related code into one file.
Changed Files:
U trunk/src/lib/crypto/krb/Makefile.in
D trunk/src/lib/crypto/krb/enctype_compare.c
D trunk/src/lib/crypto/krb/enctype_to_string.c
A trunk/src/lib/crypto/krb/enctype_util.c
D trunk/src/lib/crypto/krb/string_to_enctype.c
D trunk/src/lib/crypto/krb/valid_enctype.c
Modified: trunk/src/lib/crypto/krb/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/Makefile.in 2009-12-29 18:03:31 UTC (rev 23536)
+++ trunk/src/lib/crypto/krb/Makefile.in 2009-12-29 20:08:42 UTC (rev 23537)
@@ -39,8 +39,7 @@
encrypt.o \
encrypt_iov.o \
encrypt_length.o \
- enctype_compare.o \
- enctype_to_string.o \
+ enctype_util.o \
etypes.o \
key.o \
keyblocks.o \
@@ -58,10 +57,8 @@
random_to_key.o \
state.o \
string_to_cksumtype.o \
- string_to_enctype.o \
string_to_key.o \
valid_cksumtype.o \
- valid_enctype.o \
verify_checksum.o \
verify_checksum_iov.o
@@ -82,8 +79,7 @@
$(OUTPRE)encrypt.$(OBJEXT) \
$(OUTPRE)encrypt_iov.$(OBJEXT) \
$(OUTPRE)encrypt_length.$(OBJEXT) \
- $(OUTPRE)enctype_compare.$(OBJEXT) \
- $(OUTPRE)enctype_to_string.$(OBJEXT) \
+ $(OUTPRE)enctype_util.$(OBJEXT) \
$(OUTPRE)etypes.$(OBJEXT) \
$(OUTPRE)key.$(OBJECT) \
$(OUTPRE)keyblocks.$(OBJEXT) \
@@ -101,10 +97,7 @@
$(OUTPRE)random_to_key.$(OBJEXT) \
$(OUTPRE)state.$(OBJEXT) \
$(OUTPRE)string_to_cksumtype.$(OBJEXT) \
- $(OUTPRE)string_to_enctype.$(OBJEXT) \
- $(OUTPRE)string_to_key.$(OBJEXT) \
$(OUTPRE)valid_cksumtype.$(OBJEXT) \
- $(OUTPRE)valid_enctype.$(OBJEXT) \
$(OUTPRE)verify_checksum.$(OBJEXT) \
$(OUTPRE)verify_checksum_iov.$(OBJEXT)
@@ -124,8 +117,7 @@
$(srcdir)/encrypt.c \
$(srcdir)/encrypt_iov.c \
$(srcdir)/encrypt_length.c \
- $(srcdir)/enctype_compare.c \
- $(srcdir)/enctype_to_string.c \
+ $(srcdir)/enctype_util.c \
$(srcdir)/etypes.c \
$(srcdir)/key.c \
$(srcdir)/keyblocks.c \
@@ -144,10 +136,8 @@
$(srcdir)/random_to_key.c \
$(srcdir)/state.c \
$(srcdir)/string_to_cksumtype.c \
- $(srcdir)/string_to_enctype.c \
$(srcdir)/string_to_key.c \
$(srcdir)/valid_cksumtype.c \
- $(srcdir)/valid_enctype.c \
$(srcdir)/verify_checksum.c \
$(srcdir)/verify_checksum_iov.c
Added: trunk/src/lib/crypto/krb/enctype_util.c
===================================================================
--- trunk/src/lib/crypto/krb/enctype_util.c (rev 0)
+++ trunk/src/lib/crypto/krb/enctype_util.c 2009-12-29 20:08:42 UTC (rev 23537)
@@ -0,0 +1,110 @@
+/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+ * lib/crypto/krb/enctype_util.c
+ *
+ * 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.
+ *
+ *
+ * krb5int_c_valid_enctype()
+ * krb5int_c_weak_enctype()
+ * krb5_c_enctype_compare()
+ * krb5_string_to_enctype()
+ * krb5_enctype_to_string()
+ */
+
+#include "k5-int.h"
+#include "etypes.h"
+
+krb5_boolean KRB5_CALLCONV
+krb5_c_valid_enctype(krb5_enctype etype)
+{
+ return (find_enctype(etype) != NULL);
+}
+
+krb5_boolean KRB5_CALLCONV
+krb5int_c_weak_enctype(krb5_enctype etype)
+{
+ const struct krb5_keytypes *ktp;
+
+ ktp = find_enctype(etype);
+ return (ktp != NULL && (ktp->flags & ETYPE_WEAK) != 0);
+}
+
+krb5_error_code KRB5_CALLCONV
+krb5_c_enctype_compare(krb5_context context, krb5_enctype e1, krb5_enctype e2,
+ krb5_boolean *similar)
+{
+ const struct krb5_keytypes *ktp1, *ktp2;
+
+ ktp1 = find_enctype(e1);
+ ktp2 = find_enctype(e2);
+ if (ktp1 == NULL || ktp2 == NULL)
+ return KRB5_BAD_ENCTYPE;
+
+ *similar = (ktp1->enc == ktp2->enc && ktp1->str2key == ktp2->str2key);
+ return 0;
+}
+
+krb5_error_code KRB5_CALLCONV
+krb5_string_to_enctype(char *string, krb5_enctype *enctypep)
+{
+ int i;
+ unsigned int j;
+ const char *alias;
+ const struct krb5_keytypes *ktp;
+
+ for (i = 0; i < krb5int_enctypes_length; i++) {
+ ktp = &krb5int_enctypes_list[i];
+ if (strcasecmp(ktp->name, string) == 0) {
+ *enctypep = ktp->etype;
+ return 0;
+ }
+#define MAX_ALIASES (sizeof(ktp->aliases) / sizeof(ktp->aliases[0]))
+ for (j = 0; j < MAX_ALIASES; j++) {
+ alias = ktp->aliases[j];
+ if (alias == NULL)
+ break;
+ if (strcasecmp(alias, string) == 0) {
+ *enctypep = ktp->etype;
+ return 0;
+ }
+ }
+ }
+
+ return EINVAL;
+}
+
+krb5_error_code KRB5_CALLCONV
+krb5_enctype_to_string(krb5_enctype enctype, char *buffer, size_t buflen)
+{
+ const struct krb5_keytypes *ktp;
+
+ ktp = find_enctype(enctype);
+ if (ktp == NULL)
+ return EINVAL;
+ if (strlcpy(buffer, ktp->out_string, buflen) >= buflen)
+ return ENOMEM;
+ return 0;
+}
More information about the cvs-krb5
mailing list