SHA256
1
0
forked from pool/glibc
glibc/glibc-2.14-crypt.diff

59 lines
1.6 KiB
Diff
Raw Normal View History

Index: glibc-2.15.90/crypt/Makefile
===================================================================
--- glibc-2.15.90.orig/crypt/Makefile
+++ glibc-2.15.90/crypt/Makefile
@@ -21,6 +21,7 @@
subdir := crypt
headers := crypt.h
+headers += gnu-crypt.h ow-crypt.h
extra-libs := libcrypt
extra-libs-others := $(extra-libs)
@@ -28,6 +29,8 @@ extra-libs-others := $(extra-libs)
libcrypt-routines := crypt-entry md5-crypt sha256-crypt sha512-crypt crypt \
crypt_util
+libcrypt-routines += crypt_blowfish x86 crypt_gensalt wrapper
+
tests := cert md5c-test sha256c-test sha512c-test
include ../Makeconfig
Index: glibc-2.15.90/crypt/Versions
===================================================================
--- glibc-2.15.90.orig/crypt/Versions
+++ glibc-2.15.90/crypt/Versions
@@ -1,5 +1,6 @@
libcrypt {
GLIBC_2.0 {
crypt; crypt_r; encrypt; encrypt_r; fcrypt; setkey; setkey_r;
+ crypt_rn; crypt_ra; crypt_gensalt; crypt_gensalt_rn; crypt_gensalt_ra;
}
}
Index: glibc-2.15.90/crypt/crypt-entry.c
===================================================================
--- glibc-2.15.90.orig/crypt/crypt-entry.c
+++ glibc-2.15.90/crypt/crypt-entry.c
@@ -79,7 +79,7 @@ extern struct crypt_data _ufc_foobar;
*/
char *
-__crypt_r (key, salt, data)
+__des_crypt_r (key, salt, data)
const char *key;
const char *salt;
struct crypt_data * __restrict data;
@@ -134,6 +134,7 @@ __crypt_r (key, salt, data)
_ufc_output_conversion_r (res[0], res[1], salt, data);
return data->crypt_3_buf;
}
+#if 0
weak_alias (__crypt_r, crypt_r)
char *
@@ -174,3 +175,4 @@ __fcrypt (key, salt)
return crypt (key, salt);
}
#endif
+#endif