Skip to content

Commit 834d79c

Browse files
committed
Check for crypto lib rather than ssl
1 parent 6564b27 commit 834d79c

File tree

3 files changed

+19
-21
lines changed

3 files changed

+19
-21
lines changed

Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ if ARCH_ARM
6060
minerd_SOURCES += sha2-arm.S scrypt-arm.S
6161
endif
6262
minerd_LDFLAGS = $(PTHREAD_FLAGS)
63-
minerd_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@ -lcrypto
63+
minerd_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@
6464
minerd_CPPFLAGS = @LIBCURL_CPPFLAGS@
6565
minerd_CFLAGS =
6666

aesb-x64.S

+17-19
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,34 @@
11
#include "cpuminer-config.h"
22

33
#if defined(__linux__) && defined(__ELF__)
4-
.section .note.GNU-stack,"",%progbits
4+
.section .note.GNU-stack,"",%progbits
55
#endif
66

7-
.text
8-
.p2align 6
9-
.globl fast_aesb_single_round
10-
.globl _fast_aesb_single_round
7+
.text
8+
.p2align 6
9+
.globl fast_aesb_single_round
10+
.globl _fast_aesb_single_round
1111
fast_aesb_single_round:
1212
_fast_aesb_single_round:
1313
#if defined(_WIN64) || defined(__CYGWIN__)
14-
movdqu (%rcx), %xmm1
15-
movdqu (%r8), %xmm2
16-
aesenc %xmm2, %xmm1
14+
movdqu (%rcx), %xmm1
15+
aesenc (%r8), %xmm1
1716
movdqu %xmm1, (%rdx)
1817
#else
19-
movdqu (%rdi), %xmm1
20-
movdqu (%rdx), %xmm2
21-
aesenc %xmm2, %xmm1
18+
movdqu (%rdi), %xmm1
19+
aesenc (%rdx), %xmm1
2220
movdqu %xmm1, (%rsi)
2321
#endif
24-
ret
22+
ret
2523

26-
.text
27-
.p2align 6
28-
.globl fast_aesb_pseudo_round_mut
29-
.globl _fast_aesb_pseudo_round_mut
24+
.text
25+
.p2align 6
26+
.globl fast_aesb_pseudo_round_mut
27+
.globl _fast_aesb_pseudo_round_mut
3028
fast_aesb_pseudo_round_mut:
3129
_fast_aesb_pseudo_round_mut:
3230
#if defined(_WIN64) || defined(__CYGWIN__)
33-
mov $0, %r9
31+
mov $0, %r9
3432
mov $10, %r10
3533
movdqu (%rcx), %xmm1
3634

@@ -43,7 +41,7 @@ _fast_aesb_pseudo_round_mut:
4341

4442
movdqu %xmm1, (%rcx)
4543
#else
46-
mov $0, %r9
44+
mov $0, %r9
4745
mov $10, %r10
4846
movdqu (%rdi), %xmm1
4947

@@ -56,4 +54,4 @@ _fast_aesb_pseudo_round_mut:
5654

5755
movdqu %xmm1, (%rdi)
5856
#endif
59-
ret
57+
ret

configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ AC_CHECK_LIB([pthread], [pthread_create], PTHREAD_LIBS="-lpthread",
9696
AC_CHECK_LIB([pthreadGC], [pthread_create], PTHREAD_LIBS="-lpthreadGC"
9797
))))
9898

99-
AC_CHECK_LIB([ssl], [SSL_library_init], [], [AC_MSG_FAILURE([could not find ssl])])
99+
AC_CHECK_LIB([crypto], [OPENSSL_init], [], [AC_MSG_FAILURE([could not find crypto])])
100100

101101
AM_CONDITIONAL([WANT_JANSSON], [test x$request_jansson = xtrue])
102102
AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])

0 commit comments

Comments
 (0)