Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix static build error due to duplicate MD5 functions #255

Closed
wants to merge 2 commits into from
Closed

fix static build error due to duplicate MD5 functions #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14cfd0b
fix static build error due to duplicate MD5 functions
rofl0r Apr 11, 2013
f69f81d
x86-64.S: only compile NT funcs when NT_X86_64 is set
rofl0r Apr 11, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/Makefile
View file
Open in desktop
Expand Up @@ -81,7 +81,10 @@ AMDAPP = -DAMDAPPSDK
OCLROOT = $(ATISTREAMSDKROOT)
endif

CFLAGS = -c -Wall -Wdeclaration-after-statement -O2 -fomit-frame-pointer -I/usr/local/include $(HAVE_NSS) $(HAVE_GMP) $(HAVE_KRB5) $(OMPFLAGS) $(JOHN_CFLAGS) $(AMDAPP)
#since we link -lssl -lcrypto unconditionally, we have to define HAVE_OPENSSL as well
HAVE_OPENSSL = -DHAVE_OPENSSL
CFLAGS = -c -Wall -Wdeclaration-after-statement -O2 -fomit-frame-pointer -I/usr/local/include \
$(HAVE_NSS) $(HAVE_GMP) $(HAVE_KRB5) $(HAVE_OPENSSL) $(OMPFLAGS) $(JOHN_CFLAGS) $(AMDAPP)
# -DHAVE_SKEY
# CFLAGS for use on the main john.c file only
CFLAGS_MAIN = $(CFLAGS)
Expand Down
8 changes: 8 additions & 0 deletions src/x86-64.S
View file
Open in desktop
Expand Up @@ -1611,6 +1611,12 @@ CPU_detect_fail:
*/
/* ...converted to use %rip-relative addressing, still public domain */

/* the array output8x which is used in the asm in only available
* in NT_X86_64 mode
*/

#ifdef NT_X86_64

/*
* FIXME: this depends on the assembler being able to multiply, which won't
* work on Solaris (unless the use of GNU assembler is forced).
Expand Down Expand Up @@ -1944,6 +1950,8 @@ nt_crypt_all_8859_1_x86_64:

ret

#endif /* NT_X86_64 */

#if defined(__ELF__) && defined(__linux__)
.section .note.GNU-stack,"",@progbits
#endif