Browse Source
Use a common source file for all the hash helper functions that
previously lived in foohl.c. The foohl.c files are now generated via sed, though perhaps cpp could be used in the future. Use u_int8_t instead of unsigned char for the buffers struct fooContext. Add constants for buffer lengths and use them in function prototypes and the man pages. This is basically cosmetic surgery; there should be no functional changes. OK deraadt@OPENBSD_3_6
millert
20 years ago
10 changed files with 121 additions and 344 deletions
Split View
Diff Options
-
+19 -15src/include/rmd160.h
-
+17 -15src/include/sha1.h
-
+21 -2src/lib/libc/hash/Makefile.inc
-
+22 -19src/lib/libc/hash/helper.c
-
+11 -11src/lib/libc/hash/rmd160.3
-
+13 -13src/lib/libc/hash/rmd160.c
-
+11 -11src/lib/libc/hash/sha1.3
-
+7 -7src/lib/libc/hash/sha1.c
-
+0 -74src/lib/libc/hash/sha1hl.c
-
+0 -177src/lib/libc/hash/sha2hl.c
+ 19
- 15
src/include/rmd160.h
View File
+ 17
- 15
src/include/sha1.h
View File
+ 21
- 2
src/lib/libc/hash/Makefile.inc
View File
src/lib/libc/hash/rmd160hl.c → src/lib/libc/hash/helper.c
View File
+ 11
- 11
src/lib/libc/hash/rmd160.3
View File
+ 13
- 13
src/lib/libc/hash/rmd160.c
View File
+ 11
- 11
src/lib/libc/hash/sha1.3
View File
+ 7
- 7
src/lib/libc/hash/sha1.c
View File
+ 0
- 74
src/lib/libc/hash/sha1hl.c
View File
| @ -1,74 +0,0 @@ | |||
| /* sha1hl.c | |||
| * ---------------------------------------------------------------------------- | |||
| * "THE BEER-WARE LICENSE" (Revision 42): | |||
| * <phk@login.dkuug.dk> wrote this file. As long as you retain this notice you | |||
| * can do whatever you want with this stuff. If we meet some day, and you think | |||
| * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp | |||
| * ---------------------------------------------------------------------------- | |||
| */ | |||
| #if defined(LIBC_SCCS) && !defined(lint) | |||
| static const char rcsid[] = "$OpenBSD: sha1hl.c,v 1.5 2003/05/09 16:46:31 millert Exp $"; | |||
| #endif /* LIBC_SCCS and not lint */ | |||
| #include <sys/types.h> | |||
| #include <errno.h> | |||
| #include <fcntl.h> | |||
| #include <sha1.h> | |||
| #include <stdlib.h> | |||
| #include <stdio.h> | |||
| #include <string.h> | |||
| #include <unistd.h> | |||
| /* ARGSUSED */ | |||
| char * | |||
| SHA1End(SHA1_CTX *ctx, char *buf) | |||
| { | |||
| int i; | |||
| u_char digest[20]; | |||
| static const char hex[]="0123456789abcdef"; | |||
| if (buf == NULL && (buf = malloc(41)) == NULL) | |||
| return(NULL); | |||
| SHA1Final(digest,ctx); | |||
| for (i = 0; i < 20; i++) { | |||
| buf[i + i] = hex[digest[i] >> 4]; | |||
| buf[i + i + 1] = hex[digest[i] & 0x0f]; | |||
| } | |||
| buf[i + i] = '\0'; | |||
| memset(digest, 0, sizeof(digest)); | |||
| return(buf); | |||
| } | |||
| char * | |||
| SHA1File (char *filename, char *buf) | |||
| { | |||
| u_char buffer[BUFSIZ]; | |||
| SHA1_CTX ctx; | |||
| int fd, num, oerrno; | |||
| SHA1Init(&ctx); | |||
| if ((fd = open(filename, O_RDONLY)) < 0) | |||
| return(0); | |||
| while ((num = read(fd, buffer, sizeof(buffer))) > 0) | |||
| SHA1Update(&ctx, buffer, num); | |||
| oerrno = errno; | |||
| close(fd); | |||
| errno = oerrno; | |||
| return(num < 0 ? 0 : SHA1End(&ctx, buf)); | |||
| } | |||
| char * | |||
| SHA1Data (const u_char *data, size_t len, char *buf) | |||
| { | |||
| SHA1_CTX ctx; | |||
| SHA1Init(&ctx); | |||
| SHA1Update(&ctx, data, len); | |||
| return(SHA1End(&ctx, buf)); | |||
| } | |||
+ 0
- 177
src/lib/libc/hash/sha2hl.c
View File
| @ -1,177 +0,0 @@ | |||
| /* sha2hl.c | |||
| * ---------------------------------------------------------------------------- | |||
| * "THE BEER-WARE LICENSE" (Revision 42): | |||
| * <phk@login.dkuug.dk> wrote this file. As long as you retain this notice you | |||
| * can do whatever you want with this stuff. If we meet some day, and you think | |||
| * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp | |||
| * ---------------------------------------------------------------------------- | |||
| */ | |||
| #if defined(LIBC_SCCS) && !defined(lint) | |||
| static const char rcsid[] = "$OpenBSD: sha2hl.c,v 1.2 2003/05/09 16:46:31 millert Exp $"; | |||
| #endif /* LIBC_SCCS and not lint */ | |||
| #include <sys/types.h> | |||
| #include <errno.h> | |||
| #include <fcntl.h> | |||
| #include <sha2.h> | |||
| #include <stdlib.h> | |||
| #include <stdio.h> | |||
| #include <string.h> | |||
| #include <unistd.h> | |||
| static const char hex[]="0123456789abcdef"; | |||
| /* ARGSUSED */ | |||
| char * | |||
| SHA256_End(SHA256_CTX *ctx, char buf[SHA256_DIGEST_STRING_LENGTH]) | |||
| { | |||
| int i; | |||
| u_int8_t digest[SHA256_DIGEST_LENGTH]; | |||
| if (buf == NULL && (buf = malloc(SHA256_DIGEST_STRING_LENGTH)) == NULL) | |||
| return(NULL); | |||
| SHA256_Final(digest, ctx); | |||
| for (i = 0; i < SHA256_DIGEST_LENGTH; i++) { | |||
| buf[i + i] = hex[digest[i] >> 4]; | |||
| buf[i + i + 1] = hex[digest[i] & 0x0f]; | |||
| } | |||
| buf[i + i] = '\0'; | |||
| memset(digest, 0, sizeof(digest)); | |||
| return(buf); | |||
| } | |||
| char * | |||
| SHA256_File(char *filename, char buf[SHA256_DIGEST_STRING_LENGTH]) | |||
| { | |||
| u_int8_t buffer[BUFSIZ]; | |||
| SHA256_CTX ctx; | |||
| int fd, num, oerrno; | |||
| SHA256_Init(&ctx); | |||
| if ((fd = open(filename, O_RDONLY)) < 0) | |||
| return(0); | |||
| while ((num = read(fd, buffer, sizeof(buffer))) > 0) | |||
| SHA256_Update(&ctx, buffer, num); | |||
| oerrno = errno; | |||
| close(fd); | |||
| errno = oerrno; | |||
| return(num < 0 ? 0 : SHA256_End(&ctx, buf)); | |||
| } | |||
| char * | |||
| SHA256_Data(const u_int8_t *data, size_t len, char buf[SHA256_DIGEST_STRING_LENGTH]) | |||
| { | |||
| SHA256_CTX ctx; | |||
| SHA256_Init(&ctx); | |||
| SHA256_Update(&ctx, data, len); | |||
| return(SHA256_End(&ctx, buf)); | |||
| } | |||
| /* ARGSUSED */ | |||
| char * | |||
| SHA384_End(SHA384_CTX *ctx, char buf[SHA384_DIGEST_STRING_LENGTH]) | |||
| { | |||
| int i; | |||
| u_int8_t digest[SHA384_DIGEST_LENGTH]; | |||
| if (buf == NULL && (buf = malloc(SHA384_DIGEST_STRING_LENGTH)) == NULL) | |||
| return(NULL); | |||
| SHA384_Final(digest, ctx); | |||
| for (i = 0; i < SHA384_DIGEST_LENGTH; i++) { | |||
| buf[i + i] = hex[digest[i] >> 4]; | |||
| buf[i + i + 1] = hex[digest[i] & 0x0f]; | |||
| } | |||
| buf[i + i] = '\0'; | |||
| memset(digest, 0, sizeof(digest)); | |||
| return(buf); | |||
| } | |||
| char * | |||
| SHA384_File(char *filename, char buf[SHA384_DIGEST_STRING_LENGTH]) | |||
| { | |||
| u_int8_t buffer[BUFSIZ]; | |||
| SHA384_CTX ctx; | |||
| int fd, num, oerrno; | |||
| SHA384_Init(&ctx); | |||
| if ((fd = open(filename, O_RDONLY)) < 0) | |||
| return(0); | |||
| while ((num = read(fd, buffer, sizeof(buffer))) > 0) | |||
| SHA384_Update(&ctx, buffer, num); | |||
| oerrno = errno; | |||
| close(fd); | |||
| errno = oerrno; | |||
| return(num < 0 ? 0 : SHA384_End(&ctx, buf)); | |||
| } | |||
| char * | |||
| SHA384_Data(const u_int8_t *data, size_t len, char buf[SHA384_DIGEST_STRING_LENGTH]) | |||
| { | |||
| SHA384_CTX ctx; | |||
| SHA384_Init(&ctx); | |||
| SHA384_Update(&ctx, data, len); | |||
| return(SHA384_End(&ctx, buf)); | |||
| } | |||
| /* ARGSUSED */ | |||
| char * | |||
| SHA512_End(SHA512_CTX *ctx, char buf[SHA512_DIGEST_STRING_LENGTH]) | |||
| { | |||
| int i; | |||
| u_int8_t digest[SHA512_DIGEST_LENGTH]; | |||
| if (buf == NULL && (buf = malloc(SHA512_DIGEST_STRING_LENGTH)) == NULL) | |||
| return(NULL); | |||
| SHA512_Final(digest, ctx); | |||
| for (i = 0; i < SHA512_DIGEST_LENGTH; i++) { | |||
| buf[i + i] = hex[digest[i] >> 4]; | |||
| buf[i + i + 1] = hex[digest[i] & 0x0f]; | |||
| } | |||
| buf[i + i] = '\0'; | |||
| memset(digest, 0, sizeof(digest)); | |||
| return(buf); | |||
| } | |||
| char * | |||
| SHA512_File(char *filename, char buf[SHA512_DIGEST_STRING_LENGTH]) | |||
| { | |||
| u_int8_t buffer[BUFSIZ]; | |||
| SHA512_CTX ctx; | |||
| int fd, num, oerrno; | |||
| SHA512_Init(&ctx); | |||
| if ((fd = open(filename, O_RDONLY)) < 0) | |||
| return(0); | |||
| while ((num = read(fd, buffer, sizeof(buffer))) > 0) | |||
| SHA512_Update(&ctx, buffer, num); | |||
| oerrno = errno; | |||
| close(fd); | |||
| errno = oerrno; | |||
| return(num < 0 ? 0 : SHA512_End(&ctx, buf)); | |||
| } | |||
| char * | |||
| SHA512_Data(const u_int8_t *data, size_t len, char buf[SHA512_DIGEST_STRING_LENGTH]) | |||
| { | |||
| SHA512_CTX ctx; | |||
| SHA512_Init(&ctx); | |||
| SHA512_Update(&ctx, data, len); | |||
| return(SHA512_End(&ctx, buf)); | |||
| } | |||