svn commit: branches/uClibc-nptl/libcrypt
sjhill at uclibc.org
sjhill at uclibc.org
Mon Aug 21 04:56:08 UTC 2006
Author: sjhill
Date: 2006-08-20 21:56:08 -0700 (Sun, 20 Aug 2006)
New Revision: 15884
Log:
Merge from trunk.
Modified:
branches/uClibc-nptl/libcrypt/Makefile.in
branches/uClibc-nptl/libcrypt/crypt.c
branches/uClibc-nptl/libcrypt/md5.c
Changeset:
Modified: branches/uClibc-nptl/libcrypt/Makefile.in
===================================================================
--- branches/uClibc-nptl/libcrypt/Makefile.in 2006-08-21 04:53:46 UTC (rev 15883)
+++ branches/uClibc-nptl/libcrypt/Makefile.in 2006-08-21 04:56:08 UTC (rev 15884)
@@ -1,6 +1,5 @@
# Makefile for uClibc
#
-# Copyright (C) 2000 by Lineo, inc.
# Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
#
# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
Modified: branches/uClibc-nptl/libcrypt/crypt.c
===================================================================
--- branches/uClibc-nptl/libcrypt/crypt.c 2006-08-21 04:53:46 UTC (rev 15883)
+++ branches/uClibc-nptl/libcrypt/crypt.c 2006-08-21 04:56:08 UTC (rev 15884)
@@ -1,13 +1,9 @@
/* vi: set sw=4 ts=4: */
/*
* crypt() for uClibc
- *
- * Copyright (C) 2000 by Lineo, inc. and Erik Andersen
- * Copyright (C) 2000-2006 Erik Andersen <andersen at uclibc.org>
- *
+ * Copyright (C) 2000-2006 by Erik Andersen <andersen at uclibc.org>
* Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
*/
-/* Written by Erik Andersen <andersen at uclibc.org> */
#define __FORCE_GLIBC
#include <crypt.h>
Modified: branches/uClibc-nptl/libcrypt/md5.c
===================================================================
--- branches/uClibc-nptl/libcrypt/md5.c 2006-08-21 04:53:46 UTC (rev 15883)
+++ branches/uClibc-nptl/libcrypt/md5.c 2006-08-21 04:56:08 UTC (rev 15884)
@@ -94,13 +94,20 @@
static void __md5_Transform __P((u_int32_t [4], const unsigned char [64]));
-static const char __md5__magic[] = "$1$"; /* This string is magic for this algorithm. Having
+static const unsigned char __md5__magic[] = "$1$"; /* This string is magic for this algorithm. Having
it this way, we can get better later on */
static const unsigned char __md5_itoa64[] = /* 0 ... 63 => ascii - 64 */
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+/* shut up gcc-4.x signed warnings */
+#define strcpy(dst,src) strcpy((char*)dst,(char*)src)
+#define strlen(s) strlen((char*)s)
+#define strncat(dst,src,n) strncat((char*)dst,(char*)src,n)
+#define strncmp(s1,s2,n) strncmp((char*)s1,(char*)s2,n)
+
+
#ifdef i386
#define __md5_Encode memcpy
#define __md5_Decode memcpy
@@ -531,11 +538,11 @@
* Use MD5 for what it is best at...
*/
-char * __md5_crypt( const char *pw, const char *salt) attribute_hidden;
-char * __md5_crypt( const char *pw, const char *salt)
+char * __md5_crypt( const unsigned char *pw, const unsigned char *salt) attribute_hidden;
+char * __md5_crypt( const unsigned char *pw, const unsigned char *salt)
{
/* Static stuff */
- static const char *sp, *ep;
+ static const unsigned char *sp, *ep;
static char passwd[120], *p;
unsigned char final[17]; /* final[16] exists only to aid in looping */
More information about the uClibc-cvs
mailing list