| 1 |
commit: c0b57206a2d619d2c930643397bdb8718786ade8 |
| 2 |
Author: Mike Auty <ikelos <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 10 11:04:29 2020 +0000 |
| 4 |
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 10 11:04:29 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b57206 |
| 7 |
|
| 8 |
app-crypt/ophcrack: Fix issue 722030 (AR variable) |
| 9 |
|
| 10 |
Also clears out old versions. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
| 13 |
Signed-off-by: Mike Auty <ikelos <AT> gentoo.org> |
| 14 |
|
| 15 |
app-crypt/ophcrack/Manifest | 2 - |
| 16 |
app-crypt/ophcrack/files/ophcrack-ar.patch | 13 +++ |
| 17 |
.../ophcrack/files/ophcrack-openssl-des.patch | 92 ---------------------- |
| 18 |
app-crypt/ophcrack/ophcrack-3.6.0.ebuild | 38 --------- |
| 19 |
app-crypt/ophcrack/ophcrack-3.7.0.ebuild | 36 --------- |
| 20 |
app-crypt/ophcrack/ophcrack-3.8.0.ebuild | 17 ++-- |
| 21 |
6 files changed, 22 insertions(+), 176 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest |
| 24 |
index 823ea2bfcb1..aa3a0de8f66 100644 |
| 25 |
--- a/app-crypt/ophcrack/Manifest |
| 26 |
+++ b/app-crypt/ophcrack/Manifest |
| 27 |
@@ -1,3 +1 @@ |
| 28 |
-DIST ophcrack-3.6.0.tar.bz2 288830 BLAKE2B bc2782d08cb84df24b745fdf0e9723e058da614b73a8d25dfe77cfa2ce291eaf8abd83006a9a410f80bdd240eb81fc402d6d5ebd1c9b92b5a7f1785a203c0c7a SHA512 caa9090b622acac1114f5635c2c58a2c32453ae21a96fc4f424cbc197b056872c282cf9d41142e316a1ffbc9523832b8bc7355c1503c15ac8579470de407a5c9 |
| 29 |
-DIST ophcrack-3.7.0.tar.bz2 294045 BLAKE2B f506d29b27b4b90eadfd4d650512aea54db4228c4c63b90827a7957b544ab59dae757fc521fe62ab3be55d97e483ddde2aea9ad08c96b77d156e863a61f26312 SHA512 27e73979ca3d733629b9b34c490488cc27140efb8b90d266f270c0b95572cf40319a3fb658c02448fc7a3b825cf05c18a69f5d91bd0656d8410a30645f8dc8c6 |
| 30 |
DIST ophcrack-3.8.0.tar.bz2 293033 BLAKE2B f20bf79d5cafffaab0667b073e8d9dbcfbae0a16f4139b6304c3f6fc80a24f6ca673db9cd53e28ff277ec35821539f3960265aa28467795e25c45049acca3f31 SHA512 c66276b72299744d3e0c9fc14220c7f568e383bd324c1ede228bda5d51da78db817388421c9f5f8cd2f18687e7e53cfb0c65bcc0354b3d55ac16324c61f62dbd |
| 31 |
|
| 32 |
diff --git a/app-crypt/ophcrack/files/ophcrack-ar.patch b/app-crypt/ophcrack/files/ophcrack-ar.patch |
| 33 |
new file mode 100644 |
| 34 |
index 00000000000..422c17398d2 |
| 35 |
--- /dev/null |
| 36 |
+++ b/app-crypt/ophcrack/files/ophcrack-ar.patch |
| 37 |
@@ -0,0 +1,13 @@ |
| 38 |
+diff --git a/src/common.mk.in b/src/common.mk.in |
| 39 |
+index 0f090a8..9c133e0 100644 |
| 40 |
+--- a/src/common.mk.in |
| 41 |
++++ b/src/common.mk.in |
| 42 |
+@@ -32,7 +32,7 @@ OBJECTS = $(SOURCES:%.c=%.o) |
| 43 |
+ all: |
| 44 |
+ |
| 45 |
+ %.a: |
| 46 |
+- ar r $@ $^ |
| 47 |
++ $(AR) r $@ $^ |
| 48 |
+ $(RANLIB) $@ |
| 49 |
+ |
| 50 |
+ %.o: %.c |
| 51 |
|
| 52 |
diff --git a/app-crypt/ophcrack/files/ophcrack-openssl-des.patch b/app-crypt/ophcrack/files/ophcrack-openssl-des.patch |
| 53 |
deleted file mode 100644 |
| 54 |
index 2515c178abb..00000000000 |
| 55 |
--- a/app-crypt/ophcrack/files/ophcrack-openssl-des.patch |
| 56 |
+++ /dev/null |
| 57 |
@@ -1,92 +0,0 @@ |
| 58 |
---- a/src/lmtable.c 2013-06-04 07:42:47 UTC |
| 59 |
-+++ b/src/lmtable.c |
| 60 |
-@@ -470,8 +470,8 @@ void lmtable_mkredux(table_t *tbl, uchar |
| 61 |
- /*-------------------------------------------------------------------------*/ |
| 62 |
- void lmtable_mkhash(uchar_t *pwd, uchar_t *hash) { |
| 63 |
- uchar_t key[8]; |
| 64 |
-- des_key_schedule ks; |
| 65 |
-- des_cblock *magic = (des_cblock*)lmmagic; |
| 66 |
-+ DES_key_schedule ks; |
| 67 |
-+ DES_cblock *magic = (DES_cblock*)lmmagic; |
| 68 |
- |
| 69 |
- key[0] = pwd[0]; |
| 70 |
- key[1] = (pwd[0] << 7) | (pwd[1] >> 1); |
| 71 |
-@@ -482,7 +482,7 @@ void lmtable_mkhash(uchar_t *pwd, uchar_ |
| 72 |
- key[6] = (pwd[5] << 2) | (pwd[6] >> 6); |
| 73 |
- key[7] = (pwd[6] << 1) ; |
| 74 |
- |
| 75 |
-- des_set_odd_parity(&key); |
| 76 |
-- des_set_key(&key, ks); |
| 77 |
-- des_ecb_encrypt(magic, (des_cblock*)hash, ks, DES_ENCRYPT); |
| 78 |
-+ DES_set_odd_parity(&key); |
| 79 |
-+ DES_set_key(&key, &ks); |
| 80 |
-+ DES_ecb_encrypt(magic, (DES_cblock*)hash, &ks, DES_ENCRYPT); |
| 81 |
- } |
| 82 |
- |
| 83 |
---- a/src/samdump2/samdump2.c 2015-03-30 02:26:33 UTC |
| 84 |
-+++ b/src/samdump2/samdump2.c |
| 85 |
-@@ -71,7 +71,7 @@ void str_to_key(unsigned char *str,unsig |
| 86 |
- for (i=0;i<8;i++) { |
| 87 |
- key[i] = (key[i]<<1); |
| 88 |
- } |
| 89 |
-- des_set_odd_parity((des_cblock *)key); |
| 90 |
-+ DES_set_odd_parity((DES_cblock *)key); |
| 91 |
- } |
| 92 |
- |
| 93 |
- /* |
| 94 |
-@@ -209,8 +209,8 @@ unsigned char* utf16_to_utf8 (unsigned c |
| 95 |
- unsigned char hbootkey[0x20]; |
| 96 |
- |
| 97 |
- /* Des */ |
| 98 |
-- des_key_schedule ks1, ks2; |
| 99 |
-- des_cblock deskey1, deskey2; |
| 100 |
-+ DES_key_schedule ks1, ks2; |
| 101 |
-+ DES_cblock deskey1, deskey2; |
| 102 |
- |
| 103 |
- int i, j; |
| 104 |
- |
| 105 |
-@@ -418,15 +418,15 @@ unsigned char* utf16_to_utf8 (unsigned c |
| 106 |
- |
| 107 |
- /* Get the two decrpt keys. */ |
| 108 |
- sid_to_key1(rid,(unsigned char *)deskey1); |
| 109 |
-- des_set_key_checked((des_cblock *)deskey1,ks1); |
| 110 |
-+ DES_set_key_checked((DES_cblock *)deskey1, &ks1); |
| 111 |
- sid_to_key2(rid,(unsigned char *)deskey2); |
| 112 |
-- des_set_key_unchecked((des_cblock *)deskey2,ks2); |
| 113 |
-+ DES_set_key_unchecked((DES_cblock *)deskey2, &ks2); |
| 114 |
- |
| 115 |
- /* Decrypt the lanman password hash as two 8 byte blocks. */ |
| 116 |
-- des_ecb_encrypt((des_cblock *)obfkey, |
| 117 |
-- (des_cblock *)fb, ks1, DES_DECRYPT); |
| 118 |
-- des_ecb_encrypt((des_cblock *)(obfkey + 8), |
| 119 |
-- (des_cblock *)&fb[8], ks2, DES_DECRYPT); |
| 120 |
-+ DES_ecb_encrypt((DES_cblock *)obfkey, |
| 121 |
-+ (DES_cblock *)fb, &ks1, DES_DECRYPT); |
| 122 |
-+ DES_ecb_encrypt((DES_cblock *)(obfkey + 8), |
| 123 |
-+ (DES_cblock *)&fb[8], &ks2, DES_DECRYPT); |
| 124 |
- |
| 125 |
- |
| 126 |
- |
| 127 |
-@@ -471,16 +471,16 @@ unsigned char* utf16_to_utf8 (unsigned c |
| 128 |
- if (lm_size != 0x14) { |
| 129 |
- /* Get the two decrpt keys. */ |
| 130 |
- sid_to_key1(rid,(unsigned char *)deskey1); |
| 131 |
-- des_set_key((des_cblock *)deskey1,ks1); |
| 132 |
-+ DES_set_key((DES_cblock *)deskey1, &ks1); |
| 133 |
- sid_to_key2(rid,(unsigned char *)deskey2); |
| 134 |
-- des_set_key((des_cblock *)deskey2,ks2); |
| 135 |
-+ DES_set_key((DES_cblock *)deskey2, &ks2); |
| 136 |
- } |
| 137 |
- |
| 138 |
- /* Decrypt the NT md4 password hash as two 8 byte blocks. */ |
| 139 |
-- des_ecb_encrypt((des_cblock *)obfkey, |
| 140 |
-- (des_cblock *)fb, ks1, DES_DECRYPT); |
| 141 |
-- des_ecb_encrypt((des_cblock *)(obfkey + 8), |
| 142 |
-- (des_cblock *)&fb[8], ks2, DES_DECRYPT); |
| 143 |
-+ DES_ecb_encrypt((DES_cblock *)obfkey, |
| 144 |
-+ (DES_cblock *)fb, &ks1, DES_DECRYPT); |
| 145 |
-+ DES_ecb_encrypt((DES_cblock *)(obfkey + 8), |
| 146 |
-+ (DES_cblock *)&fb[8], &ks2, DES_DECRYPT); |
| 147 |
- |
| 148 |
- /* sf27 wrap to sf25 */ |
| 149 |
- //sf27( obfkey, (int*)&rid, fb ); |
| 150 |
|
| 151 |
diff --git a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild b/app-crypt/ophcrack/ophcrack-3.6.0.ebuild |
| 152 |
deleted file mode 100644 |
| 153 |
index 94d9250666b..00000000000 |
| 154 |
--- a/app-crypt/ophcrack/ophcrack-3.6.0.ebuild |
| 155 |
+++ /dev/null |
| 156 |
@@ -1,38 +0,0 @@ |
| 157 |
-# Copyright 1999-2018 Gentoo Foundation |
| 158 |
-# Distributed under the terms of the GNU General Public License v2 |
| 159 |
- |
| 160 |
-EAPI="6" |
| 161 |
-inherit eutils |
| 162 |
- |
| 163 |
-DESCRIPTION="A time-memory-trade-off-cracker" |
| 164 |
-HOMEPAGE="http://ophcrack.sourceforge.net/" |
| 165 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
| 166 |
- |
| 167 |
-LICENSE="GPL-2" |
| 168 |
-SLOT="0" |
| 169 |
-KEYWORDS="~amd64 ~ppc ~x86" |
| 170 |
-IUSE="debug libressl +tables" |
| 171 |
- |
| 172 |
-CDEPEND="!libressl? ( dev-libs/openssl:0= ) |
| 173 |
- libressl? ( dev-libs/libressl:0= ) |
| 174 |
- net-libs/netwib" |
| 175 |
-DEPEND="app-arch/unzip |
| 176 |
- virtual/pkgconfig |
| 177 |
- ${CDEPEND}" |
| 178 |
-RDEPEND="tables? ( app-crypt/ophcrack-tables ) |
| 179 |
- ${CDEPEND}" |
| 180 |
- |
| 181 |
-PATCHES="${FILESDIR}/ophcrack-openssl-des.patch" |
| 182 |
- |
| 183 |
-src_configure() { |
| 184 |
- |
| 185 |
- local myconf |
| 186 |
- |
| 187 |
- myconf="${myconf} $(use_enable debug) --disable-gui" |
| 188 |
- |
| 189 |
- econf ${myconf} |
| 190 |
-} |
| 191 |
- |
| 192 |
-src_install() { |
| 193 |
- emake install DESTDIR="${D}" |
| 194 |
-} |
| 195 |
|
| 196 |
diff --git a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild b/app-crypt/ophcrack/ophcrack-3.7.0.ebuild |
| 197 |
deleted file mode 100644 |
| 198 |
index 736f3bea8b8..00000000000 |
| 199 |
--- a/app-crypt/ophcrack/ophcrack-3.7.0.ebuild |
| 200 |
+++ /dev/null |
| 201 |
@@ -1,36 +0,0 @@ |
| 202 |
-# Copyright 1999-2018 Gentoo Foundation |
| 203 |
-# Distributed under the terms of the GNU General Public License v2 |
| 204 |
- |
| 205 |
-EAPI="6" |
| 206 |
-inherit eutils |
| 207 |
- |
| 208 |
-DESCRIPTION="A time-memory-trade-off-cracker" |
| 209 |
-HOMEPAGE="http://ophcrack.sourceforge.net/" |
| 210 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" |
| 211 |
- |
| 212 |
-LICENSE="GPL-2" |
| 213 |
-SLOT="0" |
| 214 |
-KEYWORDS="~amd64 ~ppc ~x86" |
| 215 |
-IUSE="debug libressl +tables" |
| 216 |
- |
| 217 |
-CDEPEND="!libressl? ( dev-libs/openssl:0= ) |
| 218 |
- libressl? ( dev-libs/libressl:0= ) |
| 219 |
- net-libs/netwib" |
| 220 |
-DEPEND="app-arch/unzip |
| 221 |
- virtual/pkgconfig |
| 222 |
- ${CDEPEND}" |
| 223 |
-RDEPEND="tables? ( app-crypt/ophcrack-tables ) |
| 224 |
- ${CDEPEND}" |
| 225 |
- |
| 226 |
-src_configure() { |
| 227 |
- |
| 228 |
- local myconf |
| 229 |
- |
| 230 |
- myconf="${myconf} $(use_enable debug) --disable-gui" |
| 231 |
- |
| 232 |
- econf ${myconf} |
| 233 |
-} |
| 234 |
- |
| 235 |
-src_install() { |
| 236 |
- emake install DESTDIR="${D}" |
| 237 |
-} |
| 238 |
|
| 239 |
diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild |
| 240 |
index 98ebe5ffe25..c35c0f3c154 100644 |
| 241 |
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild |
| 242 |
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild |
| 243 |
@@ -1,4 +1,4 @@ |
| 244 |
-# Copyright 1999-2018 Gentoo Foundation |
| 245 |
+# Copyright 1999-2020 Gentoo Authors |
| 246 |
# Distributed under the terms of the GNU General Public License v2 |
| 247 |
|
| 248 |
EAPI="6" |
| 249 |
@@ -14,15 +14,16 @@ KEYWORDS="~amd64 ~x86" |
| 250 |
IUSE="debug libressl qt5 +tables" |
| 251 |
|
| 252 |
CDEPEND="!libressl? ( dev-libs/openssl:0= ) |
| 253 |
- libressl? ( dev-libs/libressl:0= ) |
| 254 |
- net-libs/netwib |
| 255 |
- qt5? ( dev-qt/qtcharts:5 |
| 256 |
- dev-qt/qtgui:5 )" |
| 257 |
+ libressl? ( dev-libs/libressl:0= ) |
| 258 |
+ net-libs/netwib |
| 259 |
+ qt5? ( dev-qt/qtcharts:5 |
| 260 |
+ dev-qt/qtgui:5 )" |
| 261 |
DEPEND="app-arch/unzip |
| 262 |
- virtual/pkgconfig |
| 263 |
- ${CDEPEND}" |
| 264 |
+ virtual/pkgconfig |
| 265 |
+ ${CDEPEND}" |
| 266 |
RDEPEND="tables? ( app-crypt/ophcrack-tables ) |
| 267 |
- ${CDEPEND}" |
| 268 |
+ ${CDEPEND}" |
| 269 |
+PATCHES=("${FILESDIR}/ophcrack-ar.patch") |
| 270 |
|
| 271 |
src_configure() { |
Archives