1 |
commit: 3a16dc27c42366275e3b45e3876d45d1fdd3bd36 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Mar 3 16:03:47 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 3 19:12:04 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a16dc27 |
7 |
|
8 |
net-nds/openldap: remove unused patch |
9 |
|
10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/11239 |
12 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
13 |
|
14 |
...enldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch | 109 --------------------- |
15 |
1 file changed, 109 deletions(-) |
16 |
|
17 |
diff --git a/net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch b/net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch |
18 |
deleted file mode 100644 |
19 |
index e5117468f80..00000000000 |
20 |
--- a/net-nds/openldap/files/openldap-2.4.17-fix-lmpasswd-gnutls-symbols.patch |
21 |
+++ /dev/null |
22 |
@@ -1,109 +0,0 @@ |
23 |
-If GnuTLS is used, the lmpasswd module for USE=samba does not compile. |
24 |
-Forward-port an old Debian patch that upstream never applied. |
25 |
- |
26 |
-Signed-off-by: Robin H. Johnson <robbat2@g.o> |
27 |
-Signed-off-by: Steffen Hau <steffen@×××××××.de> |
28 |
-X-Gentoo-Bug: http://bugs.gentoo.org/show_bug.cgi?id=233633 |
29 |
-X-Upstream-Bug: http://www.openldap.org/its/index.cgi/Software%20Enhancements?id=4997 |
30 |
-X-Debian-Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=245341 |
31 |
- |
32 |
---- openldap-2.4.17.orig/libraries/liblutil/passwd.c 2009-07-27 18:59:19.635995474 -0700 |
33 |
-+++ openldap-2.4.17/libraries/liblutil/passwd.c 2009-07-27 19:01:13.588069010 -0700 |
34 |
-@@ -51,6 +51,26 @@ typedef unsigned char des_data_block[8]; |
35 |
- typedef PK11Context *des_context[1]; |
36 |
- #define DES_ENCRYPT CKA_ENCRYPT |
37 |
- |
38 |
-+#elif defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) |
39 |
-+# include <gcrypt.h> |
40 |
-+static int gcrypt_init = 0; |
41 |
-+ |
42 |
-+typedef const void* des_key; |
43 |
-+typedef unsigned char des_cblock[8]; |
44 |
-+typedef des_cblock des_data_block; |
45 |
-+typedef int des_key_schedule; /* unused */ |
46 |
-+typedef des_key_schedule des_context; /* unused */ |
47 |
-+#define des_failed(encrypted) 0 |
48 |
-+#define des_finish(key, schedule) |
49 |
-+ |
50 |
-+#define des_set_key_unchecked( key, key_sched ) \ |
51 |
-+ gcry_cipher_setkey( hd, key, 8 ) |
52 |
-+ |
53 |
-+#define des_ecb_encrypt( input, output, key_sched, enc ) \ |
54 |
-+ gcry_cipher_encrypt( hd, *output, 8, *input, 8 ) |
55 |
-+ |
56 |
-+#define des_set_odd_parity( key ) do {} while(0) |
57 |
-+ |
58 |
- #endif |
59 |
- |
60 |
- #endif /* SLAPD_LMHASH */ |
61 |
-@@ -651,7 +671,7 @@ static int chk_md5( |
62 |
- |
63 |
- #ifdef SLAPD_LMHASH |
64 |
- |
65 |
--#if defined(HAVE_OPENSSL) |
66 |
-+#if defined(HAVE_OPENSSL) || defined(HAVE_GNUTLS_GNUTLS_H) |
67 |
- |
68 |
- /* |
69 |
- * abstract away setting the parity. |
70 |
-@@ -841,6 +861,19 @@ static int chk_lanman( |
71 |
- des_data_block StdText = "KGS!@#$%"; |
72 |
- des_data_block PasswordHash1, PasswordHash2; |
73 |
- char PasswordHash[33], storedPasswordHash[33]; |
74 |
-+ |
75 |
-+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) |
76 |
-+ gcry_cipher_hd_t hd; |
77 |
-+ |
78 |
-+ if ( !gcrypt_init ) { |
79 |
-+ gcry_check_version( GCRYPT_VERSION ); |
80 |
-+ gcrypt_init = 1; |
81 |
-+ } |
82 |
-+ |
83 |
-+ schedule = schedule; /* unused - avoid warning */ |
84 |
-+ |
85 |
-+ gcry_cipher_open( &hd, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 ); |
86 |
-+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ |
87 |
- |
88 |
- for( i=0; i<cred->bv_len; i++) { |
89 |
- if(cred->bv_val[i] == '\0') { |
90 |
-@@ -883,6 +916,10 @@ static int chk_lanman( |
91 |
- strncpy( storedPasswordHash, passwd->bv_val, 32 ); |
92 |
- storedPasswordHash[32] = '\0'; |
93 |
- ldap_pvt_str2lower( storedPasswordHash ); |
94 |
-+ |
95 |
-+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) |
96 |
-+ gcry_cipher_close( hd ); |
97 |
-+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ |
98 |
- |
99 |
- return memcmp( PasswordHash, storedPasswordHash, 32) ? LUTIL_PASSWD_ERR : LUTIL_PASSWD_OK; |
100 |
- } |
101 |
-@@ -1138,6 +1175,19 @@ static int hash_lanman( |
102 |
- des_data_block PasswordHash1, PasswordHash2; |
103 |
- char PasswordHash[33]; |
104 |
- |
105 |
-+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) |
106 |
-+ gcry_cipher_hd_t hd; |
107 |
-+ |
108 |
-+ if ( !gcrypt_init ) { |
109 |
-+ gcry_check_version( GCRYPT_VERSION ); |
110 |
-+ gcrypt_init = 1; |
111 |
-+ } |
112 |
-+ |
113 |
-+ schedule = schedule; /* unused - avoid warning */ |
114 |
-+ |
115 |
-+ gcry_cipher_open( &hd, GCRY_CIPHER_DES, GCRY_CIPHER_MODE_ECB, 0 ); |
116 |
-+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ |
117 |
-+ |
118 |
- for( i=0; i<passwd->bv_len; i++) { |
119 |
- if(passwd->bv_val[i] == '\0') { |
120 |
- return LUTIL_PASSWD_ERR; /* NUL character in password */ |
121 |
-@@ -1168,6 +1218,10 @@ static int hash_lanman( |
122 |
- |
123 |
- hash->bv_val = PasswordHash; |
124 |
- hash->bv_len = 32; |
125 |
-+ |
126 |
-+#if defined(HAVE_GNUTLS_GNUTLS_H) && !defined(DES_ENCRYPT) |
127 |
-+ gcry_cipher_close( hd ); |
128 |
-+#endif /* HAVE_GNUTLS_GNUTLS_H && !DES_ENCRYPT */ |
129 |
- |
130 |
- return pw_string( scheme, hash ); |
131 |
- } |