crypt/crypt_blowfish
crypt/crypt_blowfish
1
0
Fork 0
mirror of https://github.com/openwall/crypt_blowfish.git synced 2025-04-18 09:24:02 +03:00
Code Releases Activity

Make crypt_blowfish buildable by modern gcc compilers by moving

Browse Source 
fcrypt weak alias definition from crypt-entry.c to wrapper.c

CVS-ID: glibc-2.1.3-crypt.diff 1.2
CVS-ID: glibc-2.3.6-crypt.diff 1.1
CVS-ID: wrapper.c 1.9
This commit is contained in:
Dmitry V. Levin 2008-07-17 03:08:21 +04:00
parent cfc65834ec
commit 06e7dce865
3 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
glibc-2.1.3-crypt.diff
View File

@ -1,6 +1,5 @@
diff -urPX nopatch glibc-2.1.3.orig/crypt/sysdeps/unix/Makefile glibc-2.1.3/crypt/sysdeps/unix/Makefile
--- glibc-2.1.3.orig/crypt/sysdeps/unix/Makefile Wed Mar 5 00:33:59 1997
+++ glibc-2.1.3/crypt/sysdeps/unix/Makefile Sun Jun 11 03:13:41 2000
--- glibc-2.1.3.orig/crypt/sysdeps/unix/Makefile 1997-03-05 00:33:59 +0000
+++ glibc-2.1.3/crypt/sysdeps/unix/Makefile 2000-06-11 03:13:41 +0000
@@ -1,4 +1,4 @@
ifeq ($(subdir),md5-crypt)
-libcrypt-routines += crypt crypt_util
@ -8,10 +7,9 @@ diff -urPX nopatch glibc-2.1.3.orig/crypt/sysdeps/unix/Makefile glibc-2.1.3/cryp
+libcrypt-routines += crypt crypt_util crypt_blowfish x86 crypt_gensalt wrapper
+dont_distribute += crypt.c crypt_util.c crypt_blowfish.c x86.S crypt_gensalt.c wrapper.c
endif
diff -urPX nopatch glibc-2.1.3.orig/crypt/sysdeps/unix/crypt-entry.c glibc-2.1.3/crypt/sysdeps/unix/crypt-entry.c
--- glibc-2.1.3.orig/crypt/sysdeps/unix/crypt-entry.c Thu Dec 10 12:49:04 1998
+++ glibc-2.1.3/crypt/sysdeps/unix/crypt-entry.c Sun Jun 11 03:14:57 2000
@@ -70,7 +70,7 @@
--- glibc-2.1.3.orig/crypt/sysdeps/unix/crypt-entry.c 1998-12-10 12:49:04 +0000
+++ glibc-2.1.3/crypt/sysdeps/unix/crypt-entry.c 2000-06-11 03:14:57 +0000
@@ -70,7 +70,7 @@ extern struct crypt_data _ufc_foobar;
*/
char *
@ -20,7 +18,7 @@ diff -urPX nopatch glibc-2.1.3.orig/crypt/sysdeps/unix/crypt-entry.c glibc-2.1.3
const char *key;
const char *salt;
struct crypt_data * __restrict data;
@@ -115,6 +115,7 @@
@@ -115,6 +115,7 @@ __crypt_r (key, salt, data)
_ufc_output_conversion_r (res[0], res[1], salt, data);
return data->crypt_3_buf;
}
@ -28,17 +26,13 @@ diff -urPX nopatch glibc-2.1.3.orig/crypt/sysdeps/unix/crypt-entry.c glibc-2.1.3
weak_alias (__crypt_r, crypt_r)
char *
@@ -130,6 +131,7 @@
return __crypt_r (key, salt, &_ufc_foobar);
@@ -147,3 +148,4 @@ __fcrypt (key, salt)
return crypt (key, salt);
}
#endif
+#endif
/*
diff -urPX nopatch glibc-2.1.3.orig/md5-crypt/Makefile glibc-2.1.3/md5-crypt/Makefile
--- glibc-2.1.3.orig/md5-crypt/Makefile Thu Jul 2 22:46:47 1998
+++ glibc-2.1.3/md5-crypt/Makefile Sun Jun 11 03:12:34 2000
--- glibc-2.1.3.orig/md5-crypt/Makefile 1998-07-02 22:46:47 +0000
+++ glibc-2.1.3/md5-crypt/Makefile 2000-06-11 03:12:34 +0000
@@ -21,7 +21,7 @@
#
subdir := md5-crypt
@ -48,9 +42,8 @@ diff -urPX nopatch glibc-2.1.3.orig/md5-crypt/Makefile glibc-2.1.3/md5-crypt/Mak
distribute := md5.h
diff -urPX nopatch glibc-2.1.3.orig/md5-crypt/Versions glibc-2.1.3/md5-crypt/Versions
--- glibc-2.1.3.orig/md5-crypt/Versions Thu Jul 2 22:32:07 1998
+++ glibc-2.1.3/md5-crypt/Versions Sun Jun 11 09:11:03 2000
--- glibc-2.1.3.orig/md5-crypt/Versions 1998-07-02 22:32:07 +0000
+++ glibc-2.1.3/md5-crypt/Versions 2000-06-11 09:11:03 +0000
@@ -1,5 +1,6 @@
libcrypt {
GLIBC_2.0 {

24
glibc-2.3.2-crypt.diff → glibc-2.3.6-crypt.diff
View File

@ -1,6 +1,5 @@
diff -urpN glibc-2.3.2.orig/crypt/Makefile glibc-2.3.2/crypt/Makefile
--- glibc-2.3.2.orig/crypt/Makefile Sat Jul 7 19:20:51 2001
+++ glibc-2.3.2/crypt/Makefile Fri Feb 27 00:23:48 2004
--- glibc-2.3.6.orig/crypt/Makefile 2001-07-06 04:54:45 +0000
+++ glibc-2.3.6/crypt/Makefile 2004-02-27 00:23:48 +0000
@@ -21,14 +21,14 @@
#
subdir := crypt
@ -18,9 +17,8 @@ diff -urpN glibc-2.3.2.orig/crypt/Makefile glibc-2.3.2/crypt/Makefile
tests = cert md5test md5c-test
diff -urpN glibc-2.3.2.orig/crypt/Versions glibc-2.3.2/crypt/Versions
--- glibc-2.3.2.orig/crypt/Versions Sat Mar 4 00:47:30 2000
+++ glibc-2.3.2/crypt/Versions Fri Feb 27 00:25:15 2004
--- glibc-2.3.6.orig/crypt/Versions 2000-03-04 00:47:30 +0000
+++ glibc-2.3.6/crypt/Versions 2004-02-27 00:25:15 +0000
@@ -1,5 +1,6 @@
libcrypt {
GLIBC_2.0 {
@ -28,9 +26,8 @@ diff -urpN glibc-2.3.2.orig/crypt/Versions glibc-2.3.2/crypt/Versions
+ crypt_rn; crypt_ra; crypt_gensalt; crypt_gensalt_rn; crypt_gensalt_ra;
}
}
diff -urpN glibc-2.3.2.orig/crypt/crypt-entry.c glibc-2.3.2/crypt/crypt-entry.c
--- glibc-2.3.2.orig/crypt/crypt-entry.c Sat Jul 7 19:20:51 2001
+++ glibc-2.3.2/crypt/crypt-entry.c Fri Feb 27 00:12:32 2004
--- glibc-2.3.6.orig/crypt/crypt-entry.c 2001-07-06 05:18:49 +0000
+++ glibc-2.3.6/crypt/crypt-entry.c 2004-02-27 00:12:32 +0000
@@ -70,7 +70,7 @@ extern struct crypt_data _ufc_foobar;
*/
@ -48,11 +45,8 @@ diff -urpN glibc-2.3.2.orig/crypt/crypt-entry.c glibc-2.3.2/crypt/crypt-entry.c
weak_alias (__crypt_r, crypt_r)
char *
@@ -130,6 +131,7 @@ crypt (key, salt)
return __crypt_r (key, salt, &_ufc_foobar);
@@ -147,3 +148,4 @@ __fcrypt (key, salt)
return crypt (key, salt);
}
#endif
+#endif
/*

10
wrapper.c
View File

@ -271,6 +271,16 @@ weak_alias(__crypt, crypt)
weak_alias(__crypt_gensalt_rn, crypt_gensalt_rn)
weak_alias(__crypt_gensalt_ra, crypt_gensalt_ra)
weak_alias(__crypt_gensalt, crypt_gensalt)
weak_alias(crypt, fcrypt)
#else
/*
* To make fcrypt users happy.
* They don't need to call init_des.
*/
char *__fcrypt (const char *key, const char *salt)
{
return crypt (key, salt);
}
#endif
#ifdef TEST