ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libcrypto: Provide x86_64-specific implementations 

modexp512 and rc4-md5 code were missing for x86_64. The files are now
generated on openssl-prepare and will be used when building for x86_64.

Fixes #224.
This commit is contained in:
Josef Söntgen 2012-05-29 14:22:13 +02:00 committed by Christian Helmuth
parent 337bb6d5f8
commit 7b8ebe34e9
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -59,6 +59,8 @@
/libports/src/lib/openssl/x86_32/cpuid.s
/libports/src/lib/openssl/x86_64/aes_enc.s
/libports/src/lib/openssl/x86_64/cpuid.s
/libports/src/lib/openssl/x86_64/modexp512.s
/libports/src/lib/openssl/x86_64/rc4_md5.s
/libports/include/python2.6
/libports/include/qoost
/libports/include/readline/keymaps.h

4
libports/lib/mk/libcrypto.mk
View File

@ -201,6 +201,9 @@ ifeq ($(filter-out $(SPECS),x86_32),)
TARGET_CPUARCH=x86_32
else ifeq ($(filter-out $(SPECS),x86_64),)
TARGET_CPUARCH=x86_64
SRC_S += modexp512.s
SRC_S += rc4_md5.s
endif
INC_DIR += $(REP_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/
@ -208,6 +211,7 @@ INC_DIR += $(REP_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/
#SRC_S += $(REP_DIR)/src/lib/openssl/$(TARGET_CPUARCH)/aes_enc.s
SRC_S += cpuid.s
#
# Generate buildinf.h
#

11
libports/ports/openssl.mk
View File

@ -29,7 +29,8 @@ $(CONTRIB_DIR)/$(OPENSSL): $(DOWNLOAD_DIR)/$(OPENSSL_TGZ)
#
generate_asm: $(OPENSSL_SRC)/x86_32/cpuid.s $(OPENSSL_SRC)/x86_64/cpuid.s \
$(OPENSSL_SRC)/x86_32/aes_enc.s $(OPENSSL_SRC)/x86_64/aes_enc.s
$(OPENSSL_SRC)/x86_32/aes_enc.s $(OPENSSL_SRC)/x86_64/aes_enc.s \
$(OPENSSL_SRC)/x86_64/modexp512.s $(OPENSSL_SRC)/x86_64/rc4_md5.s
$(OPENSSL_SRC)/x86_32/cpuid.s:
$(VERBOSE)perl $(CONTRIB_DIR)/$(OPENSSL)/crypto/x86cpuid.pl elf \
@ -47,6 +48,14 @@ $(OPENSSL_SRC)/x86_64/aes_enc.s:
$(VERBOSE)perl $(CONTRIB_DIR)/$(OPENSSL)/crypto/aes/asm/aes-x86_64.pl elf \
$(CONTRIB_DIR)/$(OPENSSEL)/crypto/perlasm/x86asm.pl elf > $@
$(OPENSSL_SRC)/x86_64/modexp512.s:
$(VERBOSE)perl $(CONTRIB_DIR)/$(OPENSSL)/crypto/bn/asm/modexp512-x86_64.pl \
$(CONTRIB_DIR)/$(OPENSSL_DIR)/crypto/perlasm/x86as.pl > $@
$(OPENSSL_SRC)/x86_64/rc4_md5.s:
$(VERBOSE)perl $(CONTRIB_DIR)/$(OPENSSL)/crypto/rc4/asm/rc4-md5-x86_64.pl \
$(CONTRIB_DIR)/$(OPENSSL_DIR)/crypto/perlasm/x86as.pl > $@
#
# Install openssl headers