|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
--- john-1.8.0/src/Makefile.orig 2013-05-29 23:21:25.000000000 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+++ john-1.8.0/src/Makefile 2016-07-21 16:18:58.367574437 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
@@ -104,6 +104,8 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
# @echo "linux-ppc64-altivec Linux, PowerPC 64-bit w/AltiVec"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
@echo "linux-ppc64 Linux, PowerPC 64-bit"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
@echo "linux-ia64 Linux, IA-64"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+ @echo "midipix-x86_64 Midipix, x86-64 with SSE2 (most common)"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+ @echo "midipix-x86-sse2 Linux, x86 32-bit with SSE2 (most common, if 32-bit)"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
@echo "freebsd-x86-64 FreeBSD, x86-64 with SSE2 (best)"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
@echo "freebsd-x86-sse2 FreeBSD, x86 with SSE2 (best if 32-bit)"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
@echo "freebsd-x86-mmx FreeBSD, x86 with MMX"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
@@ -306,6 +308,20 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
CFLAGS="$(CFLAGS) -DHAVE_CRYPT" \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
LDFLAGS="$(LDFLAGS) -lcrypt"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+midipix-x86_64:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+ $(LN) x86-64.h arch.h
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+ $(MAKE) $(PROJ) \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+ JOHN_OBJS="$(JOHN_OBJS) c3_fmt.o x86-64.o" \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+ CFLAGS="$(CFLAGS) -DHAVE_CRYPT" \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+ LDFLAGS="$(LDFLAGS) -lcrypt"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+midipix-x86-sse2:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+ $(LN) x86-sse.h arch.h
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+ $(MAKE) $(PROJ) \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+ JOHN_OBJS="$(JOHN_OBJS) c3_fmt.o x86.o x86-sse.o" \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+ CFLAGS="$(CFLAGS) -DHAVE_CRYPT" \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+ LDFLAGS="$(LDFLAGS) -lcrypt"
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
freebsd-x86-64:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
$(LN) x86-64.h arch.h
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
$(MAKE) $(PROJ) \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
--- john-1.8.0/src/x86-64.S.orig 2012-07-21 13:08:57.000000000 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+++ john-1.8.0/src/x86-64.S 2016-07-21 16:21:38.808119794 +0000
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
@@ -59,9 +59,9 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
.bss
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
#endif
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
-.globl DES_bs_all
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+.globl __imp_DES_bs_all
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
DO_ALIGN(6)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
-DES_bs_all:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+__imp_DES_bs_all:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
DES_bs_all_KSp:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
DO_SPACE(nptr(0x300))
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
DES_bs_all_KS_p:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
@@ -964,8 +964,8 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
.text
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
DO_ALIGN(6)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
-.globl DES_bs_init_asm
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
-DES_bs_init_asm:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+.globl __imp_DES_bs_init_asm
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+__imp_DES_bs_init_asm:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
pcmpeqd %xmm0,%xmm0
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
movdqa %xmm0,pnot
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
paddb %xmm0,%xmm0
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
@@ -991,8 +991,8 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
#define rounds_and_swapped %eax
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
DO_ALIGN(6)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
-.globl DES_bs_crypt
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
-DES_bs_crypt:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+.globl __imp_DES_bs_crypt
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+__imp_DES_bs_crypt:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
cmpl $0,DES_bs_all_keys_changed(%rip)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
jz DES_bs_crypt_body
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
pushq %rdi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
@@ -1055,8 +1055,8 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
ret
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
DO_ALIGN(6)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
-.globl DES_bs_crypt_25
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
-DES_bs_crypt_25:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+.globl __imp_DES_bs_crypt_25
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+__imp_DES_bs_crypt_25:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
cmpl $0,DES_bs_all_keys_changed(%rip)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
jnz DES_bs_finalize_keys_25
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
DES_bs_crypt_25_body:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
@@ -1175,8 +1175,8 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
#define rounds %eax
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
DO_ALIGN(6)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
-.globl DES_bs_crypt_LM
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
-DES_bs_crypt_LM:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+.globl __imp_DES_bs_crypt_LM
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+__imp_DES_bs_crypt_LM:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
movl (%rdi),%r8d
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
movdqa mask01,%xmm7
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
movdqa mask02,%xmm8
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
@@ -1350,8 +1350,8 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
#ifdef UNDERSCORES
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
#define CPU_detect _CPU_detect
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
#endif
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
-.globl CPU_detect
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
-CPU_detect:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+.globl __imp_CPU_detect
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
+__imp_CPU_detect:
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
pushq %rbx
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
movl $1,%eax
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
cd059d |
cpuid
|