summaryrefslogtreecommitdiff
path: root/crypto/des
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2020-05-01 15:15:02 +1000
committerShane Lontis <shane.lontis@oracle.com>2020-05-02 17:55:07 +1000
commitc450922c8cd8bc7326670fe83e2eb453fea79595 (patch)
treeb6318f11fcc75e2ecb5ef5f6be13a45092fba1a6 /crypto/des
parente0624f0d702b57e23ecaf5236ce1bafdd85ec649 (diff)
downloadopenssl-new-c450922c8cd8bc7326670fe83e2eb453fea79595.tar.gz
Add solaris assembler fixes for legacy provider
The legacy provider contains assembler references. Most code is automagically pulled in from the libcrypto - but the platform specific assembler functions will not be visible in the symbol table. Copying BNASM and DESASM into liblegacy seems to be a better solution than exposing platform specific function in libcrypto.num. Added a missing call in the des_cbc code for sparc. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/11697)
Diffstat (limited to 'crypto/des')
-rw-r--r--crypto/des/build.info8
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/des/build.info b/crypto/des/build.info
index 0e5fd171e2..eb0c75496b 100644
--- a/crypto/des/build.info
+++ b/crypto/des/build.info
@@ -14,7 +14,7 @@ IF[{- !$disabled{asm} -}]
ENDIF
LIBS=../../libcrypto
-$COMMON=set_key.c ecb3_enc.c $DESASM
+$COMMON=set_key.c ecb3_enc.c
$ALL=$COMMON\
ecb_enc.c cbc_enc.c \
cfb64enc.c cfb64ede.c cfb_enc.c \
@@ -22,8 +22,10 @@ $ALL=$COMMON\
str2key.c pcbc_enc.c qud_cksm.c rand_key.c \
fcrypt.c xcbc_enc.c cbc_cksm.c
-SOURCE[../../libcrypto]=$ALL
-SOURCE[../../providers/libfips.a]=$COMMON
+SOURCE[../../libcrypto]=$ALL $DESASM
+SOURCE[../../providers/libfips.a]=$COMMON $DESASM
+SOURCE[../../providers/liblegacy.a]=$DESASM
+
DEFINE[../../libcrypto]=$DESDEF
DEFINE[../../providers/libfips.a]=$DESDEF
DEFINE[../../providers/liblegacy.a]=$DESDEF