6857427 remove the unused key and certificate files from the gate

6 files changed, 7 insertions, 57 deletions

diff --git a/usr/src/cmd/cmd-crypto/etc/Makefile b/usr/src/cmd/cmd-crypto/etc/Makefile
index c0fab473f2..4c156da343 100644
--- a/usr/src/cmd/cmd-crypto/etc/Makefile
+++ b/usr/src/cmd/cmd-crypto/etc/Makefile
@@ -24,8 +24,7 @@
 #
 
 RELEASECERTS =		SUNW_SunOS_5.10
-RELEASECRYPTO =		SUNW_SunOS_5.10 \
-			SUNW_SunOS_5.11_Limited
+RELEASECRYPTO =		SUNW_SunOS_5.10
 
 ETCCRYPTOFILES = \
 	kcf.conf \
diff --git a/usr/src/cmd/cmd-crypto/etc/certs/SUNWCryptographic11_Limited b/usr/src/cmd/cmd-crypto/etc/certs/SUNWCryptographic11_Limited
deleted file mode 100644
index 4d960f7c1a..0000000000
--- a/usr/src/cmd/cmd-crypto/etc/certs/SUNWCryptographic11_Limited
+++ /dev/null
@@ -1,49 +0,0 @@
- Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
- Use is subject to license terms.
-
- CDDL HEADER START
-
- The contents of this file are subject to the terms of the
- Common Development and Distribution License (the "License").
- You may not use this file except in compliance with the License.
-
- You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- or http://www.opensolaris.org/os/licensing.
- See the License for the specific language governing permissions
- and limitations under the License.
-
- When distributing Covered Code, include this CDDL HEADER in each
- file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- If applicable, add the following below this CDDL HEADER, with the
- fields enclosed by brackets "[]" replaced with your own identifying
- information: Portions Copyright [yyyy] [name of copyright owner]
-
- CDDL HEADER END
-
-
-ident	"%Z%%M%	%I%	%E% SMI"
-
------BEGIN CERTIFICATE-----
-MIID+DCCAuCgAwIBAgIEFAAAJDANBgkqhkiG9w0BAQUFADBMMR0wGwYDVQQKExRT
-dW4gTWljcm9zeXN0ZW1zIEluYzErMCkGA1UEAxMiU29sYXJpcyBDcnlwdG9ncmFw
-aGljIEZyYW1ld29yayBDQTAeFw0wNjAxMTcyMTUzMzhaFw0xMjA1MjYyMDUzMzha
-MHUxEzARBgNVBAMTClN1bk9TIDUuMTExFTATBgNVBAsTDFVzYWdlTGltaXRlZDEo
-MCYGA1UECxMfU29sYXJpcyBDcnlwdG9ncmFwaGljIEZyYW1ld29yazEdMBsGA1UE
-ChMUU3VuIE1pY3Jvc3lzdGVtcyBJbmMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
-AoGBAJFtVRdwryKcSX5lqz6aAbmNy9RbHhy1KF+F6ddDAMTJcZMlg8AynhMLhtVe
-LBNKpTnJ4B/Nb8mNRYl4L6ajoVG1G5F0YA5TKVEjUGUaEIz3cup1sG7ljNTs+lWb
-8O7M+19kZCrsxM2sbvzJx60JhmjjpKxPy8FP/hJ+cFYqbqeZAgMBAAGjggE7MIIB
-NzAdBgNVHQ4EFgQUqy6nnhlVDZg5ftV6j/lR8Z1qiCwwHwYDVR0jBBgwFoAUQghO
-JN0Okzm+CUHvKd4bEFFPLMcwDgYDVR0PAQH/BAQDAgeAMEcGA1UdIARAMD4wPAYL
-YIZIAYb3AIN9k18wLTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5zdW4uY29tL3Br
-aS9jcHMuaHRtbDCBhgYDVR0fBH8wfTB7oCegJYYjaHR0cDovL3d3dy5zdW4uY29t
-L3BraS9wa2lzY2ZjYS5jcmyiUKROMEwxKzApBgNVBAMTIlNvbGFyaXMgQ3J5cHRv
-Z3JhcGhpYyBGcmFtZXdvcmsgQ0ExHTAbBgNVBAoTFFN1biBNaWNyb3N5c3RlbXMg
-SW5jMBMGA1UdJQQMMAoGCCsGAQUFBwMDMA0GCSqGSIb3DQEBBQUAA4IBAQAkIzct
-iqdNTMVBLh8xh4Mvqw8tVM9y2tVksxLzK/Clbtu0QyaRNylc2+B0ScPkKwKs9GDT
-oLzZmcx+hOmmxA4UDUsKrbTdncVoX6qdwSDvHbwu5vndfwAcItULJt+pHz10UCFB
-3fGbZe3ZUu0hzViD2NF2uRWcpCIFKCfTESbQ16IOCoCWOSK0QJdkSU2bwe5r7pBl
-HznAEkX8XRI25cXCzg6wSS2dAJ9Lk5SS3LswWZt1M0FDUQfb8LjAq4nuJ58sKmNI
-HEUxf8QGrcXNiRqJP8v5lQGxnBes6Y9g7ASjzTCpFr+xefjCY0HqckDghbcd1XA2
-yzJtabW9y96Rf251
------END CERTIFICATE-----
diff --git a/usr/src/pkgdefs/SUNWcryptoint/prototype_com b/usr/src/pkgdefs/SUNWcryptoint/prototype_com
index 5a1c93376f..3ebf356950 100644
--- a/usr/src/pkgdefs/SUNWcryptoint/prototype_com
+++ b/usr/src/pkgdefs/SUNWcryptoint/prototype_com
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # This required package information file contains a list of package contents.
@@ -49,9 +49,7 @@ f none etc/certs/SUNWosnetSE 644 root sys
 d none etc/crypto 755 root sys
 d none etc/crypto/certs 755 root sys
 f none etc/crypto/certs/SUNWosnet 644 root sys
-f none etc/crypto/certs/SUNWosnetLimited 644 root sys
 f none etc/crypto/certs/SUNWosnetCF 644 root sys
-f none etc/crypto/certs/SUNWosnetCFLimited 644 root sys
 # CRYPT DELETE END
 d none kernel 755 root sys
 d none kernel/crypto 755 root sys
diff --git a/usr/src/pkgdefs/SUNWcsr/prototype_com b/usr/src/pkgdefs/SUNWcsr/prototype_com
index 8d4c2437e2..782d1e9cb2 100644
--- a/usr/src/pkgdefs/SUNWcsr/prototype_com
+++ b/usr/src/pkgdefs/SUNWcsr/prototype_com
@@ -112,7 +112,6 @@ d none etc/crypto/certs 755 root sys
 f none etc/crypto/certs/CA 644 root sys
 l none etc/crypto/certs/SUNWObjectCA=../../../etc/certs/SUNWObjectCA
 f none etc/crypto/certs/SUNW_SunOS_5.10 644 root sys
-f none etc/crypto/certs/SUNW_SunOS_5.11_Limited 644 root sys
 d none etc/crypto/crls 755 root sys
 f none etc/datemsk 444 root sys
 s none etc/dcopy=../usr/sbin/dcopy
diff --git a/usr/src/req.flg b/usr/src/req.flg
index 7a45490cc7..a273d05761 100644
--- a/usr/src/req.flg
+++ b/usr/src/req.flg
@@ -34,8 +34,6 @@ echo_file usr/src/Makefile.psm
 echo_file usr/src/Makefile.psm.targ
 echo_file usr/src/xmod/xmod_files
 echo_file usr/closed/cmd/cmd-crypto/etc/certs/SUNWosnetCF
-echo_file usr/closed/cmd/cmd-crypto/etc/certs/SUNWosnetCFLimited
 echo_file usr/closed/cmd/cmd-crypto/etc/certs/SUNWosnetSE
 echo_file usr/closed/cmd/cmd-crypto/etc/keys/SUNWosnetCF
-echo_file usr/closed/cmd/cmd-crypto/etc/keys/SUNWosnetCFLimited
 echo_file usr/closed/cmd/cmd-crypto/etc/keys/SUNWosnetSE
diff --git a/usr/src/tools/scripts/bfu.sh b/usr/src/tools/scripts/bfu.sh
index 444116b4f5..a19e2d9789 100644
--- a/usr/src/tools/scripts/bfu.sh
+++ b/usr/src/tools/scripts/bfu.sh
@@ -4145,6 +4145,11 @@ crypto_cleanup()
 	# care of them
 	rm -f $rootprefix/platform/sun4v/kernel/drv/sparcv9/n2cp.esa
 
+	# Remove old limited use certificates
+	rm -f $rootprefix/etc/crypto/certs/SUNW_SunOS_5.11_Limited
+	rm -f $rootprefix/etc/crypto/certs/SUNWosnetCFLimited
+	rm -f $rootprefix/etc/crypto/certs/SUNWosnetLimited
+
 	print "\n"
 }