diff options
author | Zhanna Tsitkov <tsitkova@mit.edu> | 2013-09-24 10:13:26 -0400 |
---|---|---|
committer | Zhanna Tsitkov <tsitkova@mit.edu> | 2013-09-24 13:02:57 -0400 |
commit | ee61e4adf18c6f032b7ab2fa790fb261cfc4105c (patch) | |
tree | 89fe7e55e2fb3df036885444021b3d895e6bc23f /src/lib/krb5 | |
parent | bf6734efe7ddedd302fc126e4c4e13764c276d23 (diff) | |
download | krb5-ee61e4adf18c6f032b7ab2fa790fb261cfc4105c.tar.gz krb5-ee61e4adf18c6f032b7ab2fa790fb261cfc4105c.tar.xz krb5-ee61e4adf18c6f032b7ab2fa790fb261cfc4105c.zip |
Factor out krb5int_random_string() routine
Make krb5int_random_string() function available outside ccache code.
Move it into a separate file under lib/krb5/krb hierarchy.
Diffstat (limited to 'src/lib/krb5')
-rw-r--r-- | src/lib/krb5/ccache/cc-int.h | 2 | ||||
-rw-r--r-- | src/lib/krb5/ccache/cc_memory.c | 38 | ||||
-rw-r--r-- | src/lib/krb5/krb/Makefile.in | 3 | ||||
-rw-r--r-- | src/lib/krb5/krb/random_str.c | 68 | ||||
-rw-r--r-- | src/lib/krb5/libkrb5.exports | 1 |
5 files changed, 72 insertions, 40 deletions
diff --git a/src/lib/krb5/ccache/cc-int.h b/src/lib/krb5/ccache/cc-int.h index 272425e393..b125d87646 100644 --- a/src/lib/krb5/ccache/cc-int.h +++ b/src/lib/krb5/ccache/cc-int.h @@ -51,8 +51,6 @@ krb5int_cc_initialize(void); void krb5int_cc_finalize(void); -krb5_error_code krb5int_random_string (krb5_context, char *, unsigned int); - /* * Cursor for iterating over ccache types */ diff --git a/src/lib/krb5/ccache/cc_memory.c b/src/lib/krb5/ccache/cc_memory.c index e1cc638f8e..0354575c5c 100644 --- a/src/lib/krb5/ccache/cc_memory.c +++ b/src/lib/krb5/ccache/cc_memory.c @@ -513,44 +513,6 @@ krb5_mcc_generate_new (krb5_context context, krb5_ccache *id) return KRB5_OK; } -/* Utility routine: Creates a random memory ccache name. - * This algorithm was selected because it creates readable - * random ccache names in a fixed size buffer. */ - -krb5_error_code -krb5int_random_string (krb5_context context, char *string, unsigned int length) -{ - static const unsigned char charlist[] = - "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; - krb5_error_code err = 0; - unsigned char *bytes = NULL; - unsigned int bytecount = length - 1; - - if (!err) { - bytes = malloc (bytecount); - if (bytes == NULL) { err = ENOMEM; } - } - - if (!err) { - krb5_data data; - data.length = bytecount; - data.data = (char *) bytes; - err = krb5_c_random_make_octets (context, &data); - } - - if (!err) { - unsigned int i; - for (i = 0; i < bytecount; i++) { - string [i] = charlist[bytes[i] % (sizeof (charlist) - 1)]; - } - string[length - 1] = '\0'; - } - - if (bytes != NULL) { free (bytes); } - - return err; -} - /* * Requires: * id is a file credential cache diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index 3cf857e0d2..7d1682dd82 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -82,6 +82,7 @@ STLIBOBJS= \ gic_opt_set_pa.o \ princ_comp.o \ privsafe.o \ + random_str.o \ rd_cred.o \ rd_error.o \ rd_priv.o \ @@ -191,6 +192,7 @@ OBJS= $(OUTPRE)addr_comp.$(OBJEXT) \ $(OUTPRE)gic_opt_set_pa.$(OBJEXT) \ $(OUTPRE)princ_comp.$(OBJEXT) \ $(OUTPRE)privsafe.$(OBJEXT) \ + $(OUTPRE)random_str.$(OBJEXT) \ $(OUTPRE)rd_cred.$(OBJEXT) \ $(OUTPRE)rd_error.$(OBJEXT) \ $(OUTPRE)rd_priv.$(OBJEXT) \ @@ -300,6 +302,7 @@ SRCS= $(srcdir)/addr_comp.c \ $(srcdir)/gic_opt_set_pa.c \ $(srcdir)/princ_comp.c \ $(srcdir)/privsafe.c \ + $(srcdir)/random_str.c \ $(srcdir)/rd_cred.c \ $(srcdir)/rd_error.c \ $(srcdir)/rd_priv.c \ diff --git a/src/lib/krb5/krb/random_str.c b/src/lib/krb5/krb/random_str.c new file mode 100644 index 0000000000..e31430ccac --- /dev/null +++ b/src/lib/krb5/krb/random_str.c @@ -0,0 +1,68 @@ +/* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */ +/* lib/krb5/krb/random_str.c - Definition of krb5int_random_string() */ +/* + * Copyright (C) 2013 by the Massachusetts Institute of Technology. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "k5-int.h" + +/* Utility routine: Creates a readable random string in a fixed size buffer. */ +krb5_error_code +krb5int_random_string(krb5_context context, char *string, unsigned int length) +{ + static const unsigned char charlist[] = + "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; + krb5_error_code err = 0; + unsigned char *bytes = NULL; + unsigned int bytecount = length - 1; + + if (!err) { + bytes = malloc (bytecount); + if (bytes == NULL) { err = ENOMEM; } + } + + if (!err) { + krb5_data data; + data.length = bytecount; + data.data = (char *) bytes; + err = krb5_c_random_make_octets (context, &data); + } + + if (!err) { + unsigned int i; + for (i = 0; i < bytecount; i++) { + string [i] = charlist[bytes[i] % (sizeof (charlist) - 1)]; + } + string[length - 1] = '\0'; + } + + if (bytes != NULL) { free (bytes); } + + return err; +} diff --git a/src/lib/krb5/libkrb5.exports b/src/lib/krb5/libkrb5.exports index 59d698a821..b03e73af6f 100644 --- a/src/lib/krb5/libkrb5.exports +++ b/src/lib/krb5/libkrb5.exports @@ -609,6 +609,7 @@ krb5int_get_authdata_containee_types krb5int_init_context_kdc krb5int_initialize_library krb5int_parse_enctype_list +krb5int_random_string krb5int_trace profile_abandon profile_add_relation |