Check for crypto lib rather than ssl

lucasjones · May 21, 2014 · 834d79c · 834d79c
1 parent 6564b27
commit 834d79c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 21 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -60,7 +60,7 @@ if ARCH_ARM
 minerd_SOURCES += sha2-arm.S scrypt-arm.S
 endif
 minerd_LDFLAGS	= $(PTHREAD_FLAGS)
-minerd_LDADD	= @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@ -lcrypto
+minerd_LDADD	= @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@
 minerd_CPPFLAGS = @LIBCURL_CPPFLAGS@
 minerd_CFLAGS   = 
 

diff --git a/aesb-x64.S b/aesb-x64.S
@@ -1,36 +1,34 @@
 #include "cpuminer-config.h"
 
 #if defined(__linux__) && defined(__ELF__)
-	.section .note.GNU-stack,"",%progbits
+    .section .note.GNU-stack,"",%progbits
 #endif
 
-	.text
-	.p2align 6
-	.globl fast_aesb_single_round
-	.globl _fast_aesb_single_round
+    .text
+    .p2align 6
+    .globl fast_aesb_single_round
+    .globl _fast_aesb_single_round
 fast_aesb_single_round:
 _fast_aesb_single_round:
 #if defined(_WIN64) || defined(__CYGWIN__)
-	movdqu (%rcx), %xmm1
-	movdqu (%r8), %xmm2
-    aesenc %xmm2, %xmm1
+    movdqu (%rcx), %xmm1
+    aesenc (%r8), %xmm1
     movdqu %xmm1, (%rdx)
 #else
-	movdqu (%rdi), %xmm1
-	movdqu (%rdx), %xmm2
-    aesenc %xmm2, %xmm1
+    movdqu (%rdi), %xmm1
+    aesenc (%rdx), %xmm1
     movdqu %xmm1, (%rsi)
 #endif
-	ret
+    ret
 
-	.text
-	.p2align 6
-	.globl fast_aesb_pseudo_round_mut
-	.globl _fast_aesb_pseudo_round_mut
+    .text
+    .p2align 6
+    .globl fast_aesb_pseudo_round_mut
+    .globl _fast_aesb_pseudo_round_mut
 fast_aesb_pseudo_round_mut:
 _fast_aesb_pseudo_round_mut:
 #if defined(_WIN64) || defined(__CYGWIN__)
-	mov $0, %r9
+    mov $0, %r9
     mov $10, %r10
     movdqu (%rcx), %xmm1
 
@@ -43,7 +41,7 @@ _fast_aesb_pseudo_round_mut:
 
     movdqu %xmm1, (%rcx)
 #else
-	mov $0, %r9
+    mov $0, %r9
     mov $10, %r10
     movdqu (%rdi), %xmm1
 
@@ -56,4 +54,4 @@ _fast_aesb_pseudo_round_mut:
 
     movdqu %xmm1, (%rdi)
 #endif
-	ret
+    ret
diff --git a/configure.ac b/configure.ac
@@ -96,7 +96,7 @@ AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS="-lpthread",
       AC_CHECK_LIB([pthreadGC], [pthread_create], PTHREAD_LIBS="-lpthreadGC"
 ))))
 
-AC_CHECK_LIB([ssl], [SSL_library_init], [], [AC_MSG_FAILURE([could not find ssl])])
+AC_CHECK_LIB([crypto], [OPENSSL_init], [], [AC_MSG_FAILURE([could not find crypto])])
 
 AM_CONDITIONAL([WANT_JANSSON], [test x$request_jansson = xtrue])
 AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])