1 |
diff -Nurp glibc-2.17/crypt/crypt-entry.c glibc-2.17-crypt/crypt/crypt-entry.c |
diff -Nurp glibc-2.20.orig/crypt/crypt-entry.c glibc-2.20/crypt/crypt-entry.c |
2 |
--- glibc-2.17/crypt/crypt-entry.c 2012-12-25 05:02:13.000000000 +0200 |
--- glibc-2.20.orig/crypt/crypt-entry.c 2014-09-07 11:09:09.000000000 +0300 |
3 |
+++ glibc-2.17-crypt/crypt/crypt-entry.c 2012-12-29 00:37:58.031449367 +0200 |
+++ glibc-2.20/crypt/crypt-entry.c 2014-09-08 16:20:13.818182442 +0300 |
4 |
@@ -81,7 +81,7 @@ extern struct crypt_data _ufc_foobar; |
@@ -71,7 +71,7 @@ extern struct crypt_data _ufc_foobar; |
5 |
*/ |
*/ |
6 |
|
|
7 |
char * |
char * |
10 |
const char *key; |
const char *key; |
11 |
const char *salt; |
const char *salt; |
12 |
struct crypt_data * __restrict data; |
struct crypt_data * __restrict data; |
13 |
@@ -155,6 +155,7 @@ __crypt_r (key, salt, data) |
@@ -145,6 +145,7 @@ __crypt_r (key, salt, data) |
14 |
_ufc_output_conversion_r (res[0], res[1], salt, data); |
_ufc_output_conversion_r (res[0], res[1], salt, data); |
15 |
return data->crypt_3_buf; |
return data->crypt_3_buf; |
16 |
} |
} |
18 |
weak_alias (__crypt_r, crypt_r) |
weak_alias (__crypt_r, crypt_r) |
19 |
|
|
20 |
char * |
char * |
21 |
@@ -180,6 +181,7 @@ crypt (key, salt) |
@@ -170,6 +171,7 @@ crypt (key, salt) |
22 |
|
|
23 |
return __crypt_r (key, salt, &_ufc_foobar); |
return __crypt_r (key, salt, &_ufc_foobar); |
24 |
} |
} |
26 |
|
|
27 |
|
|
28 |
/* |
/* |
29 |
diff -Nurp glibc-2.17/crypt/Makefile glibc-2.17-crypt/crypt/Makefile |
diff -Nurp glibc-2.20.orig/crypt/Makefile glibc-2.20/crypt/Makefile |
30 |
--- glibc-2.17/crypt/Makefile 2012-12-25 05:02:13.000000000 +0200 |
--- glibc-2.20.orig/crypt/Makefile 2014-09-07 11:09:09.000000000 +0300 |
31 |
+++ glibc-2.17-crypt/crypt/Makefile 2012-12-29 00:37:58.031449367 +0200 |
+++ glibc-2.20/crypt/Makefile 2014-09-08 16:20:13.818182442 +0300 |
32 |
@@ -20,13 +20,13 @@ |
@@ -22,13 +22,13 @@ subdir := crypt |
33 |
# |
|
34 |
subdir := crypt |
include ../Makeconfig |
35 |
|
|
36 |
-headers := crypt.h |
-headers := crypt.h |
37 |
+headers := crypt.h gnu-crypt.h ow-crypt.h |
+headers := crypt.h gnu-crypt.h ow-crypt.h |
45 |
|
|
46 |
tests := cert md5c-test sha256c-test sha512c-test badsalttest |
tests := cert md5c-test sha256c-test sha512c-test badsalttest |
47 |
|
|
48 |
diff -Nurp glibc-2.17/crypt/Versions glibc-2.17-crypt/crypt/Versions |
diff -Nurp glibc-2.20.orig/crypt/Versions glibc-2.20/crypt/Versions |
49 |
--- glibc-2.17/crypt/Versions 2012-12-25 05:02:13.000000000 +0200 |
--- glibc-2.20.orig/crypt/Versions 2014-09-07 11:09:09.000000000 +0300 |
50 |
+++ glibc-2.17-crypt/crypt/Versions 2012-12-29 00:37:58.031449367 +0200 |
+++ glibc-2.20/crypt/Versions 2014-09-08 16:20:13.818182442 +0300 |
51 |
@@ -1,5 +1,6 @@ |
@@ -1,5 +1,6 @@ |
52 |
libcrypt { |
libcrypt { |
53 |
GLIBC_2.0 { |
GLIBC_2.0 { |