| 1 |
diff -Nurp glibc-2.17/crypt/crypt-entry.c glibc-2.17-crypt/crypt/crypt-entry.c |
| 2 |
--- glibc-2.17/crypt/crypt-entry.c 2012-12-25 05:02:13.000000000 +0200 |
| 3 |
+++ glibc-2.17-crypt/crypt/crypt-entry.c 2012-12-29 00:37:58.031449367 +0200 |
| 4 |
@@ -81,7 +81,7 @@ extern struct crypt_data _ufc_foobar; |
| 5 |
*/ |
| 6 |
|
| 7 |
char * |
| 8 |
-__crypt_r (key, salt, data) |
| 9 |
+__des_crypt_r (key, salt, data) |
| 10 |
const char *key; |
| 11 |
const char *salt; |
| 12 |
struct crypt_data * __restrict data; |
| 13 |
@@ -155,6 +155,7 @@ __crypt_r (key, salt, data) |
| 14 |
_ufc_output_conversion_r (res[0], res[1], salt, data); |
| 15 |
return data->crypt_3_buf; |
| 16 |
} |
| 17 |
+#if 0 |
| 18 |
weak_alias (__crypt_r, crypt_r) |
| 19 |
|
| 20 |
char * |
| 21 |
@@ -180,6 +181,7 @@ crypt (key, salt) |
| 22 |
|
| 23 |
return __crypt_r (key, salt, &_ufc_foobar); |
| 24 |
} |
| 25 |
+#endif |
| 26 |
|
| 27 |
|
| 28 |
/* |
| 29 |
diff -Nurp glibc-2.17/crypt/Makefile glibc-2.17-crypt/crypt/Makefile |
| 30 |
--- glibc-2.17/crypt/Makefile 2012-12-25 05:02:13.000000000 +0200 |
| 31 |
+++ glibc-2.17-crypt/crypt/Makefile 2012-12-29 00:37:58.031449367 +0200 |
| 32 |
@@ -20,13 +20,13 @@ |
| 33 |
# |
| 34 |
subdir := crypt |
| 35 |
|
| 36 |
-headers := crypt.h |
| 37 |
+headers := crypt.h gnu-crypt.h ow-crypt.h |
| 38 |
|
| 39 |
extra-libs := libcrypt |
| 40 |
extra-libs-others := $(extra-libs) |
| 41 |
|
| 42 |
libcrypt-routines := crypt-entry md5-crypt sha256-crypt sha512-crypt crypt \ |
| 43 |
- crypt_util |
| 44 |
+ crypt_util crypt_blowfish x86 crypt_gensalt wrapper |
| 45 |
|
| 46 |
tests := cert md5c-test sha256c-test sha512c-test badsalttest |
| 47 |
|
| 48 |
diff -Nurp glibc-2.17/crypt/Versions glibc-2.17-crypt/crypt/Versions |
| 49 |
--- glibc-2.17/crypt/Versions 2012-12-25 05:02:13.000000000 +0200 |
| 50 |
+++ glibc-2.17-crypt/crypt/Versions 2012-12-29 00:37:58.031449367 +0200 |
| 51 |
@@ -1,5 +1,6 @@ |
| 52 |
libcrypt { |
| 53 |
GLIBC_2.0 { |
| 54 |
crypt; crypt_r; encrypt; encrypt_r; fcrypt; setkey; setkey_r; |
| 55 |
+ crypt_rn; crypt_ra; crypt_gensalt; crypt_gensalt_rn; crypt_gensalt_ra; |
| 56 |
} |
| 57 |
} |
Parent Directory
| 
Revision Log