diff options
| author | jp161948 <none@none> | 2006-06-20 07:42:14 -0700 |
|---|---|---|
| committer | jp161948 <none@none> | 2006-06-20 07:42:14 -0700 |
| commit | c8911a0c944bbc7434e353cf2c48a6e85c429569 (patch) | |
| tree | 5223e38280b6b6a539dfe0a13d4051accc791a1f | |
| parent | 1e2e7a75ddb1eedcefa449ce98fd5862749b72ee (diff) | |
| download | illumos-gate-c8911a0c944bbc7434e353cf2c48a6e85c429569.tar.gz | |
6436753 remove $(__GNUC) from usr/src/lib/openssl/Makefile.openssl
6436754 remove VIA PadLock Advanced Cryptography Engine from OpenSSL
--HG--
rename : usr/src/common/openssl/crypto/engine/eng_padlock.c => deleted_files/usr/src/common/openssl/crypto/engine/eng_padlock.c
| -rw-r--r-- | deleted_files/usr/src/common/openssl/crypto/engine/eng_padlock.c (renamed from usr/src/common/openssl/crypto/engine/eng_padlock.c) | 0 | ||||
| -rw-r--r-- | usr/src/lib/openssl/Makefile.openssl | 15 | ||||
| -rw-r--r-- | usr/src/lib/openssl/libcrypto/Makefile.com | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/usr/src/common/openssl/crypto/engine/eng_padlock.c b/deleted_files/usr/src/common/openssl/crypto/engine/eng_padlock.c index 3c37b6725d..3c37b6725d 100644 --- a/usr/src/common/openssl/crypto/engine/eng_padlock.c +++ b/deleted_files/usr/src/common/openssl/crypto/engine/eng_padlock.c diff --git a/usr/src/lib/openssl/Makefile.openssl b/usr/src/lib/openssl/Makefile.openssl index 7f640bb1f9..6867c968c2 100644 --- a/usr/src/lib/openssl/Makefile.openssl +++ b/usr/src/lib/openssl/Makefile.openssl @@ -52,15 +52,16 @@ OPENSSL_NO_XXX = \ -DOPENSSL_NO_EC \ -DOPENSSL_NO_ECDH \ -DOPENSSL_NO_ECDSA \ - -DOPENSSL_NO_HW_CSWIFT \ - -DOPENSSL_NO_HW_ATALLA \ - -DOPENSSL_NO_HW_NURON \ - -DOPENSSL_NO_HW_UBSEC \ + -DOPENSSL_NO_HW_4758_CCA \ -DOPENSSL_NO_HW_AEP \ - -DOPENSSL_NO_HW_SUREWARE \ + -DOPENSSL_NO_HW_ATALLA \ -DOPENSSL_NO_HW_CHIL \ + -DOPENSSL_NO_HW_CSWIFT \ -DOPENSSL_NO_HW_GMP \ - -DOPENSSL_NO_HW_4758_CCA + -DOPENSSL_NO_HW_NURON \ + -DOPENSSL_NO_HW_PADLOCK \ + -DOPENSSL_NO_HW_SUREWARE \ + -DOPENSSL_NO_HW_UBSEC OPENSSL_BUILD_CPPFLAGS_sparc = -DB_ENDIAN @@ -86,4 +87,4 @@ OPENSSL_LDFLAGS += -L$(PARENT_ROOT)$(SFWLIBDIR) OPENSSL_LDFLAGS += -L$(SFWLIBDIR) OPENSSL_DYNFLAGS = -R $(SFWLIBDIR) -$(__GNUC)CFLAGS += -_gcc=-fasm +CFLAGS += -_gcc=-fasm diff --git a/usr/src/lib/openssl/libcrypto/Makefile.com b/usr/src/lib/openssl/libcrypto/Makefile.com index 416d2efe48..f972fa42b9 100644 --- a/usr/src/lib/openssl/libcrypto/Makefile.com +++ b/usr/src/lib/openssl/libcrypto/Makefile.com @@ -129,7 +129,7 @@ OBJECTS = sunw.o \ engine/eng_lib.o engine/tb_rand.o \ engine/tb_rsa.o engine/tb_store.o \ engine/tb_ecdh.o engine/tb_ecdsa.o \ - engine/eng_cryptodev.o engine/eng_padlock.o \ + engine/eng_cryptodev.o \ \ engine/hw_pk11.o engine/hw_pk11_pub.o \ \ |