diff options
Diffstat (limited to 'md5-crypt')
| -rw-r--r-- | md5-crypt/Makefile | 6 | ||||
| -rw-r--r-- | md5-crypt/md5-crypt.c | 18 | ||||
| -rw-r--r-- | md5-crypt/md5.c | 30 | ||||
| -rw-r--r-- | md5-crypt/md5.h | 19 | ||||
| -rw-r--r-- | md5-crypt/onlymd5-entry.c | 1 |
5 files changed, 61 insertions, 13 deletions
diff --git a/md5-crypt/Makefile b/md5-crypt/Makefile index 6216ddb437..84ec20c5a3 100644 --- a/md5-crypt/Makefile +++ b/md5-crypt/Makefile @@ -33,6 +33,9 @@ extra-libs-others := $(extra-libs) md5-routines := crypt-entry md5-crypt md5 libcrypt-routines := $(md5-routines) +onlymd5-routines := onlymd5-entry md5-crypt md5 +distribute += onlymd5-entry + include ../Makeconfig rpath-link := $(common-objpfx)md5-crypt:$(rpath-link) @@ -60,7 +63,7 @@ endif define o-iterator-doit $(objpfx)$(patsubst %,$(libtype$o),md5crypt): \ - $(md5-routines:%=$(objpfx)%$o); $$(build-extra-lib) + $(onlymd5-routines:%=$(objpfx)%$o); $$(build-extra-lib) endef object-suffixes-left = $(object-suffixes) include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes)) @@ -69,3 +72,4 @@ include $(patsubst %,$(..)o-iterator.mk,$(object-suffixes)) # This ensures they will load libc.so for needed symbols if loaded by # a statically-linked program that hasn't already loaded it. $(objpfx)libcrypt.so: $(common-objpfx)libc.so +$(objpfx)libmd5crypt.so: $(common-objpfx)libc.so diff --git a/md5-crypt/md5-crypt.c b/md5-crypt/md5-crypt.c index 2b4965ba58..dd9d413c42 100644 --- a/md5-crypt/md5-crypt.c +++ b/md5-crypt/md5-crypt.c @@ -37,8 +37,10 @@ static const char b64t[64] = /* Prototypes for local functions. */ -extern char *md5_crypt_r __P ((const char *key, const char *salt, char *buffer, - int buflen)); +extern char *__md5_crypt_r __P ((const char *key, const char *salt, + char *buffer, int buflen)); +extern char *md5_crypt_r __P ((const char *key, const char *salt, + char *buffer, int buflen)); extern char *md5_crypt __P ((const char *key, const char *salt)); @@ -46,7 +48,7 @@ extern char *md5_crypt __P ((const char *key, const char *salt)); /* This entry point is equivalent to the `crypt' function in Unix libcs. */ char * -md5_crypt_r (key, salt, buffer, buflen) +__md5_crypt_r (key, salt, buffer, buflen) const char *key; const char *salt; char *buffer; @@ -155,10 +157,10 @@ md5_crypt_r (key, salt, buffer, buflen) /* Now we can construct the result string. It consists of three parts. */ - cp = stpncpy (buffer, md5_salt_prefix, MAX (0, buflen)); + cp = __stpncpy (buffer, md5_salt_prefix, MAX (0, buflen)); buflen -= sizeof (md5_salt_prefix); - cp = stpncpy (cp, salt, MIN ((size_t) buflen, salt_len)); + cp = __stpncpy (cp, salt, MIN ((size_t) buflen, salt_len)); buflen -= MIN ((size_t) buflen, salt_len); if (buflen > 0) @@ -201,10 +203,11 @@ md5_crypt_r (key, salt, buffer, buflen) return buffer; } +weak_alias (__md5_crypt_r, md5_crypt_r) char * -md5_crypt (key, salt) +__md5_crypt (key, salt) const char *key; const char *salt; { @@ -222,5 +225,6 @@ md5_crypt (key, salt) return NULL; } - return md5_crypt_r (key, salt, buffer, buflen); + return __md5_crypt_r (key, salt, buffer, buflen); } +weak_alias (__md5_crypt, md5_crypt) diff --git a/md5-crypt/md5.c b/md5-crypt/md5.c index d7b0f0e38c..00aab15828 100644 --- a/md5-crypt/md5.c +++ b/md5-crypt/md5.c @@ -1,6 +1,6 @@ /* md5.c - Functions to compute MD5 message digest of files or memory blocks according to the definition of MD5 in RFC 1321 from April 1992. - Copyright (C) 1995, 1996 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -42,6 +42,15 @@ # if __BYTE_ORDER == __BIG_ENDIAN # define WORDS_BIGENDIAN 1 # endif +/* We need to keep the namespace clean so define the MD5 function + protected using leading __ and use weak aliases. */ +# define md5_init_ctx __md5_init_ctx +# define md5_process_block __md5_process_block +# define md5_process_bytes __md5_process_bytes +# define md5_finish_ctx __md5_finish_ctx +# define md5_read_ctx __md5_read_ctx +# define md5_stream __md5_stream +# define md5_buffer __md5_buffer #endif #ifdef WORDS_BIGENDIAN @@ -417,3 +426,22 @@ md5_process_block (buffer, len, ctx) ctx->C = C; ctx->D = D; } + + +#ifdef _LIBC +/* Define weak aliases. */ +# undef md5_init_ctx +weak_alias (__md5_init_ctx, md5_init_ctx) +# undef md5_process_block +weak_alias (__md5_process_block, md5_process_block) +# undef md5_process_bytes +weak_alias (__md5_process_bytes, md5_process_bytes) +# undef md5_finish_ctx +weak_alias (__md5_finish_ctx, md5_finish_ctx) +# undef md5_read_ctx +weak_alias (__md5_read_ctx, md5_read_ctx) +# undef md5_stream +weak_alias (__md5_stream, md5_stream) +# undef md5_buffer +weak_alias (__md5_buffer, md5_buffer) +#endif diff --git a/md5-crypt/md5.h b/md5-crypt/md5.h index e8ee9dc018..f7babfb5ed 100644 --- a/md5-crypt/md5.h +++ b/md5-crypt/md5.h @@ -1,6 +1,6 @@ -/* md5.h - Declaration of functions and data types used for MD5 sum - computing library functions. - Copyright (C) 1995, 1996 Free Software Foundation, Inc. +/* Declaration of functions and data types used for MD5 sum computing + library functions. + Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -97,12 +97,15 @@ struct md5_ctx /* Initialize structure containing state of computation. (RFC 1321, 3.3: Step 3) */ +extern void __md5_init_ctx __P ((struct md5_ctx *ctx)); extern void md5_init_ctx __P ((struct md5_ctx *ctx)); /* Starting with the result of former calls of this function (or the initialization function update the context for the next LEN bytes starting at BUFFER. It is necessary that LEN is a multiple of 64!!! */ +extern void __md5_process_block __P ((const void *buffer, size_t len, + struct md5_ctx *ctx)); extern void md5_process_block __P ((const void *buffer, size_t len, struct md5_ctx *ctx)); @@ -110,6 +113,8 @@ extern void md5_process_block __P ((const void *buffer, size_t len, initialization function update the context for the next LEN bytes starting at BUFFER. It is NOT required that LEN is a multiple of 64. */ +extern void __md5_process_bytes __P ((const void *buffer, size_t len, + struct md5_ctx *ctx)); extern void md5_process_bytes __P ((const void *buffer, size_t len, struct md5_ctx *ctx)); @@ -120,6 +125,7 @@ extern void md5_process_bytes __P ((const void *buffer, size_t len, IMPORTANT: On some systems it is required that RESBUF is correctly aligned for a 32 bits value. */ +extern void *__md5_finish_ctx __P ((struct md5_ctx *ctx, void *resbuf)); extern void *md5_finish_ctx __P ((struct md5_ctx *ctx, void *resbuf)); @@ -129,18 +135,23 @@ extern void *md5_finish_ctx __P ((struct md5_ctx *ctx, void *resbuf)); IMPORTANT: On some systems it is required that RESBUF is correctly aligned for a 32 bits value. */ +extern void *__md5_read_ctx __P ((const struct md5_ctx *ctx, void *resbuf)); extern void *md5_read_ctx __P ((const struct md5_ctx *ctx, void *resbuf)); /* Compute MD5 message digest for bytes read from STREAM. The resulting message digest number will be written into the 16 bytes beginning at RESBLOCK. */ +extern int __md5_stream __P ((FILE *stream, void *resblock)); extern int md5_stream __P ((FILE *stream, void *resblock)); /* Compute MD5 message digest for LEN bytes beginning at BUFFER. The result is always in little endian byte order, so that a byte-wise output yields to the wanted ASCII representation of the message digest. */ -extern void *md5_buffer __P ((const char *buffer, size_t len, void *resblock)); +extern void *__md5_buffer __P ((const char *buffer, size_t len, + void *resblock)); +extern void *md5_buffer __P ((const char *buffer, size_t len, + void *resblock)); #endif diff --git a/md5-crypt/onlymd5-entry.c b/md5-crypt/onlymd5-entry.c new file mode 100644 index 0000000000..d03fae9bd1 --- /dev/null +++ b/md5-crypt/onlymd5-entry.c @@ -0,0 +1 @@ +#include <sysdeps/generic/crypt-entry.c> |