PSARC/2006/610 Data Encryption Kit (SUNWcry) Removal

6498066 PSARC/2006/610 Data Encryption Kit (SUNWcry) Removal

--HG--
rename : usr/src/common/openssl/crypto/sunw.c => deleted_files/usr/src/common/openssl/crypto/sunw.c
rename : usr/src/lib/openssl/libcrypto/common/mapfile => deleted_files/usr/src/lib/openssl/libcrypto/common/mapfile
rename : usr/src/lib/openssl/libcrypto_extra/Makefile => deleted_files/usr/src/lib/openssl/libcrypto_extra/Makefile
rename : usr/src/lib/openssl/libcrypto_extra/Makefile.com => deleted_files/usr/src/lib/openssl/libcrypto_extra/Makefile.com
rename : usr/src/lib/openssl/libcrypto_extra/amd64/Makefile => deleted_files/usr/src/lib/openssl/libcrypto_extra/amd64/Makefile
rename : usr/src/lib/openssl/libcrypto_extra/i386/Makefile => deleted_files/usr/src/lib/openssl/libcrypto_extra/i386/Makefile
rename : usr/src/lib/openssl/libcrypto_extra/sparc/Makefile => deleted_files/usr/src/lib/openssl/libcrypto_extra/sparc/Makefile
rename : usr/src/lib/openssl/libcrypto_extra/sparcv9/Makefile => deleted_files/usr/src/lib/openssl/libcrypto_extra/sparcv9/Makefile
rename : usr/src/lib/openssl/libssl_extra/Makefile => deleted_files/usr/src/lib/openssl/libssl_extra/Makefile
rename : usr/src/lib/openssl/libssl_extra/Makefile.com => deleted_files/usr/src/lib/openssl/libssl_extra/Makefile.com
rename : usr/src/lib/openssl/libssl_extra/amd64/Makefile => deleted_files/usr/src/lib/openssl/libssl_extra/amd64/Makefile
rename : usr/src/lib/openssl/libssl_extra/i386/Makefile => deleted_files/usr/src/lib/openssl/libssl_extra/i386/Makefile
rename : usr/src/lib/openssl/libssl_extra/sparc/Makefile => deleted_files/usr/src/lib/openssl/libssl_extra/sparc/Makefile
rename : usr/src/lib/openssl/libssl_extra/sparcv9/Makefile => deleted_files/usr/src/lib/openssl/libssl_extra/sparcv9/Makefile
rename : usr/src/lib/pkcs11/Makefile.softtoken.amd64 => deleted_files/usr/src/lib/pkcs11/Makefile.softtoken.amd64
rename : usr/src/lib/pkcs11/Makefile.softtoken.com => deleted_files/usr/src/lib/pkcs11/Makefile.softtoken.com
rename : usr/src/lib/pkcs11/Makefile.softtoken.i386 => deleted_files/usr/src/lib/pkcs11/Makefile.softtoken.i386
rename : usr/src/lib/pkcs11/README.Makefiles => deleted_files/usr/src/lib/pkcs11/README.Makefiles
rename : usr/src/lib/pkcs11/Makefile.softtoken.sparc => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.softtoken.sparc.1
rename : usr/src/lib/pkcs11/Makefile.softtoken.sparcv9 => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile.softtoken.sparcv9.1
rename : usr/src/lib/pkcs11/pkcs11_softtoken_extra/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/Makefile
rename : usr/src/lib/pkcs11/pkcs11_softtoken_extra/Makefile.com => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/Makefile.com
rename : usr/src/lib/pkcs11/pkcs11_softtoken_extra/amd64/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/amd64/Makefile
rename : usr/src/lib/pkcs11/pkcs11_softtoken_extra/i386/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/i386/Makefile
rename : usr/src/lib/pkcs11/pkcs11_softtoken_extra/sparc/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/sparc/Makefile
rename : usr/src/lib/pkcs11/pkcs11_softtoken_extra/sparcv9/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/sparcv9/Makefile
rename : usr/src/pkgdefs/SUNWcry/Makefile => deleted_files/usr/src/pkgdefs/SUNWcry/Makefile
rename : usr/src/pkgdefs/SUNWcry/pkginfo.tmpl => deleted_files/usr/src/pkgdefs/SUNWcry/pkginfo.tmpl
rename : usr/src/pkgdefs/SUNWcry/postinstall => deleted_files/usr/src/pkgdefs/SUNWcry/postinstall
rename : usr/src/pkgdefs/SUNWcry/preremove => deleted_files/usr/src/pkgdefs/SUNWcry/preremove
rename : usr/src/pkgdefs/SUNWcry/prototype_com => deleted_files/usr/src/pkgdefs/SUNWcry/prototype_com
rename : usr/src/pkgdefs/SUNWcry/prototype_i386 => deleted_files/usr/src/pkgdefs/SUNWcry/prototype_i386
rename : usr/src/pkgdefs/SUNWcry/prototype_sparc => deleted_files/usr/src/pkgdefs/SUNWcry/prototype_sparc
rename : usr/src/pkgdefs/SUNWcryr/Makefile => deleted_files/usr/src/pkgdefs/SUNWcryr/Makefile
rename : usr/src/pkgdefs/SUNWcryr/pkginfo.tmpl => deleted_files/usr/src/pkgdefs/SUNWcryr/pkginfo.tmpl
rename : usr/src/pkgdefs/SUNWcryr/postinstall => deleted_files/usr/src/pkgdefs/SUNWcryr/postinstall
rename : usr/src/pkgdefs/SUNWcryr/preremove => deleted_files/usr/src/pkgdefs/SUNWcryr/preremove
rename : usr/src/pkgdefs/SUNWcryr/prototype_com => deleted_files/usr/src/pkgdefs/SUNWcryr/prototype_com
rename : usr/src/pkgdefs/SUNWcryr/prototype_i386 => deleted_files/usr/src/pkgdefs/SUNWcryr/prototype_i386
rename : usr/src/pkgdefs/SUNWcryr/prototype_sparc => deleted_files/usr/src/pkgdefs/SUNWcryr/prototype_sparc
rename : usr/src/uts/sparc/aes256/Makefile => deleted_files/usr/src/uts/sparc/aes256/Makefile
rename : usr/src/uts/sparc/arcfour2048/Makefile => deleted_files/usr/src/uts/sparc/arcfour2048/Makefile
rename : usr/src/uts/sparc/blowfish448/Makefile => deleted_files/usr/src/uts/sparc/blowfish448/Makefile
rename : usr/src/uts/sun4u/aes256/Makefile => deleted_files/usr/src/uts/sun4u/aes256/Makefile

1 files changed, 0 insertions, 14 deletions

diff --git a/usr/src/common/openssl/ssl/ssl.h b/usr/src/common/openssl/ssl/ssl.h
index b6b05f144a..8800e3ddd1 100644
--- a/usr/src/common/openssl/ssl/ssl.h
+++ b/usr/src/common/openssl/ssl/ssl.h
@@ -167,16 +167,6 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
-/*
- * The portions of this code that are #ifdef CRYPTO_UNLIMITED are
- *
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- *
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifndef HEADER_SSL_H 
 #define HEADER_SSL_H 
 
@@ -325,11 +315,7 @@ extern "C" {
 /* The following cipher list is used by default.
  * It also is substituted when an application-defined cipher list string
  * starts with 'DEFAULT'. */
-#ifdef CRYPTO_UNLIMITED
 #define SSL_DEFAULT_CIPHER_LIST	"ALL:!ADH:+RC4:@STRENGTH" /* low priority for RC4 */
-#else
-#define SSL_DEFAULT_CIPHER_LIST	"ALL:!DHE-RSA-AES256-SHA:!DHE-DSS-AES256-SHA:!AES256-SHA:!ADH:+RC4:@STRENGTH" /* low priority for RC4 */
-#endif /* CRYPTO_UNLIMITED */
 
 /* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
 #define SSL_SENT_SHUTDOWN	1