Crypto modularity proj: Separate files under crypto directory based on their functionality. Move Kerberos specific files into krb subdir and MIT specific - into builtin subdir. Place all tests into crypto_tests subfolder.

bigredbutton: whitespace

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@22477 dc483132-0cff-0310-8789-dd5450dbe970

1 files changed, 0 insertions, 101 deletions

diff --git a/src/lib/crypto/string_to_key.c b/src/lib/crypto/string_to_key.c
deleted file mode 100644
index 71d9db650..000000000
--- a/src/lib/crypto/string_to_key.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * 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 "k5-int.h"
-#include "etypes.h"
-
-krb5_error_code KRB5_CALLCONV
-krb5_c_string_to_key_with_params(krb5_context context,
-				 krb5_enctype enctype,
-				 const krb5_data *string,
-				 const krb5_data *salt,
-				 const krb5_data *params,
-				 krb5_keyblock *key);
-
-
-krb5_error_code KRB5_CALLCONV
-krb5_c_string_to_key(krb5_context context, krb5_enctype enctype,
-		     const krb5_data *string, const krb5_data *salt,
-		     krb5_keyblock *key)
-{
-    return krb5_c_string_to_key_with_params(context, enctype, string, salt,
-					    NULL, key);
-}
-
-krb5_error_code KRB5_CALLCONV
-krb5_c_string_to_key_with_params(krb5_context context, krb5_enctype enctype,
-				 const krb5_data *string,
-				 const krb5_data *salt,
-				 const krb5_data *params, krb5_keyblock *key)
-{
-    int i;
-    krb5_error_code ret;
-    const struct krb5_enc_provider *enc;
-    size_t keybytes, keylength;
-
-    for (i=0; i<krb5_enctypes_length; i++) {
-	if (krb5_enctypes_list[i].etype == enctype)
-	    break;
-    }
-
-    if (i == krb5_enctypes_length)
-	return(KRB5_BAD_ENCTYPE);
-
-    enc = krb5_enctypes_list[i].enc;
-/* xxx AFS string2key function is indicated by a special length  in
- * the salt in much of the code.  However only the DES enctypes can
- * deal with this.  Using s2kparams would be a much better solution.*/
-    if (salt && salt->length == SALT_TYPE_AFS_LENGTH) {
-	switch (enctype) {
-	case ENCTYPE_DES_CBC_CRC:
-	case ENCTYPE_DES_CBC_MD4:
-	case ENCTYPE_DES_CBC_MD5:
-	    break;
-	default:
-	    return (KRB5_CRYPTO_INTERNAL);
-	}
-    }
-
-    keybytes = enc->keybytes;
-    keylength = enc->keylength;
-
-    if ((key->contents = (krb5_octet *) malloc(keylength)) == NULL)
-	return(ENOMEM);
-
-    key->magic = KV5M_KEYBLOCK;
-    key->enctype = enctype;
-    key->length = keylength;
-
-    ret = (*krb5_enctypes_list[i].str2key)(enc, string, salt, params, key);
-    if (ret) {
-	memset(key->contents, 0, keylength);
-	free(key->contents);
-	key->length = 0;
-	key->contents = NULL;
-    }
-
-    return(ret);
-}