From f84cd33e5fce68ebbf9c03e787c2e5eb680d9324 Mon Sep 17 00:00:00 2001 From: tron Date: Thu, 21 Jul 2005 15:42:41 +0000 Subject: [PATCH] Remove unused functions SHA*_End() and SHA*_Data(). --- sys/crypto/sha2/sha2.c | 99 +----------------------------------------- sys/crypto/sha2/sha2.h | 8 +--- 2 files changed, 3 insertions(+), 104 deletions(-) diff --git a/sys/crypto/sha2/sha2.c b/sys/crypto/sha2/sha2.c index 97e45a61f6e1..8d93f7da6fa7 100644 --- a/sys/crypto/sha2/sha2.c +++ b/sys/crypto/sha2/sha2.c @@ -1,4 +1,4 @@ -/* $NetBSD: sha2.c,v 1.4 2005/05/17 04:14:57 christos Exp $ */ +/* $NetBSD: sha2.c,v 1.5 2005/07/21 15:42:41 tron Exp $ */ /* $KAME: sha2.c,v 1.9 2003/07/20 00:28:38 itojun Exp $ */ /* @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sha2.c,v 1.4 2005/05/17 04:14:57 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sha2.c,v 1.5 2005/07/21 15:42:41 tron Exp $"); #include #include @@ -606,38 +606,6 @@ void SHA256_Final(sha2_byte digest[], SHA256_CTX* context) { usedspace = 0; } -char *SHA256_End(SHA256_CTX* context, char buffer[]) { - sha2_byte digest[SHA256_DIGEST_LENGTH], *d = digest; - int i; - - /* Sanity check: */ - assert(context != (SHA256_CTX*)0); - - if (buffer != (char*)0) { - SHA256_Final(digest, context); - - for (i = 0; i < SHA256_DIGEST_LENGTH; i++) { - *buffer++ = hexdigits[(*d & 0xf0) >> 4]; - *buffer++ = hexdigits[*d & 0x0f]; - d++; - } - *buffer = (char)0; - } else { - bzero(context, sizeof(*context)); - } - bzero(digest, SHA256_DIGEST_LENGTH); - return buffer; -} - -char* SHA256_Data(const sha2_byte* data, size_t len, char digest[SHA256_DIGEST_STRING_LENGTH]) { - SHA256_CTX context; - - SHA256_Init(&context); - SHA256_Update(&context, data, len); - return SHA256_End(&context, digest); -} - - /*** SHA-512: *********************************************************/ void SHA512_Init(SHA512_CTX* context) { if (context == (SHA512_CTX*)0) { @@ -935,38 +903,6 @@ void SHA512_Final(sha2_byte digest[], SHA512_CTX* context) { bzero(context, sizeof(*context)); } -char *SHA512_End(SHA512_CTX* context, char buffer[]) { - sha2_byte digest[SHA512_DIGEST_LENGTH], *d = digest; - int i; - - /* Sanity check: */ - assert(context != (SHA512_CTX*)0); - - if (buffer != (char*)0) { - SHA512_Final(digest, context); - - for (i = 0; i < SHA512_DIGEST_LENGTH; i++) { - *buffer++ = hexdigits[(*d & 0xf0) >> 4]; - *buffer++ = hexdigits[*d & 0x0f]; - d++; - } - *buffer = (char)0; - } else { - bzero(context, sizeof(*context)); - } - bzero(digest, SHA512_DIGEST_LENGTH); - return buffer; -} - -char* SHA512_Data(const sha2_byte* data, size_t len, char digest[SHA512_DIGEST_STRING_LENGTH]) { - SHA512_CTX context; - - SHA512_Init(&context); - SHA512_Update(&context, data, len); - return SHA512_End(&context, digest); -} - - /*** SHA-384: *********************************************************/ void SHA384_Init(SHA384_CTX* context) { if (context == (SHA384_CTX*)0) { @@ -1009,34 +945,3 @@ void SHA384_Final(sha2_byte digest[], SHA384_CTX* context) { /* Zero out state data */ bzero(context, sizeof(*context)); } - -char *SHA384_End(SHA384_CTX* context, char buffer[]) { - sha2_byte digest[SHA384_DIGEST_LENGTH], *d = digest; - int i; - - /* Sanity check: */ - assert(context != (SHA384_CTX*)0); - - if (buffer != (char*)0) { - SHA384_Final(digest, context); - - for (i = 0; i < SHA384_DIGEST_LENGTH; i++) { - *buffer++ = hexdigits[(*d & 0xf0) >> 4]; - *buffer++ = hexdigits[*d & 0x0f]; - d++; - } - *buffer = (char)0; - } else { - bzero(context, sizeof(*context)); - } - bzero(digest, SHA384_DIGEST_LENGTH); - return buffer; -} - -char* SHA384_Data(const sha2_byte* data, size_t len, char digest[SHA384_DIGEST_STRING_LENGTH]) { - SHA384_CTX context; - - SHA384_Init(&context); - SHA384_Update(&context, data, len); - return SHA384_End(&context, digest); -} diff --git a/sys/crypto/sha2/sha2.h b/sys/crypto/sha2/sha2.h index b681874bc755..fd44d7991c68 100644 --- a/sys/crypto/sha2/sha2.h +++ b/sys/crypto/sha2/sha2.h @@ -1,4 +1,4 @@ -/* $NetBSD: sha2.h,v 1.2 2005/02/26 23:04:17 perry Exp $ */ +/* $NetBSD: sha2.h,v 1.3 2005/07/21 15:42:41 tron Exp $ */ /* $KAME: sha2.h,v 1.4 2003/07/20 00:28:38 itojun Exp $ */ /* @@ -118,20 +118,14 @@ typedef SHA512_CTX SHA384_CTX; void SHA256_Init __P((SHA256_CTX *)); void SHA256_Update __P((SHA256_CTX*, const u_int8_t*, size_t)); void SHA256_Final __P((u_int8_t[SHA256_DIGEST_LENGTH], SHA256_CTX*)); -char* SHA256_End __P((SHA256_CTX*, char[SHA256_DIGEST_STRING_LENGTH])); -char* SHA256_Data __P((const u_int8_t*, size_t, char[SHA256_DIGEST_STRING_LENGTH])); void SHA384_Init __P((SHA384_CTX*)); void SHA384_Update __P((SHA384_CTX*, const u_int8_t*, size_t)); void SHA384_Final __P((u_int8_t[SHA384_DIGEST_LENGTH], SHA384_CTX*)); -char* SHA384_End __P((SHA384_CTX*, char[SHA384_DIGEST_STRING_LENGTH])); -char* SHA384_Data __P((const u_int8_t*, size_t, char[SHA384_DIGEST_STRING_LENGTH])); void SHA512_Init __P((SHA512_CTX*)); void SHA512_Update __P((SHA512_CTX*, const u_int8_t*, size_t)); void SHA512_Final __P((u_int8_t[SHA512_DIGEST_LENGTH], SHA512_CTX*)); -char* SHA512_End __P((SHA512_CTX*, char[SHA512_DIGEST_STRING_LENGTH])); -char* SHA512_Data __P((const u_int8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH])); #ifdef __cplusplus }