diff options
| author | johnz <none@none> | 2007-04-28 05:45:13 -0700 |
|---|---|---|
| committer | johnz <none@none> | 2007-04-28 05:45:13 -0700 |
| commit | af42e7a1b13e4c061ab39a8e786471056b1656cc (patch) | |
| tree | a2edd235be2cef5072ff736a44ffcb7329f6c63d /usr/src | |
| parent | 84f7a9b9dca4f23b5f50edef0e59d7eb44301114 (diff) | |
| download | illumos-gate-af42e7a1b13e4c061ab39a8e786471056b1656cc.tar.gz | |
6549126 elfsign text-format trust roots need to be un-CDDLed, un-SCMed
--HG--
rename : usr/src/cmd/cmd-crypto/etc/certs/SUNWObjectCA => usr/src/cmd/cmd-crypto/etc/certs/SUNWObjectCA.annot
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/cmd/cmd-crypto/etc/Makefile | 15 | ||||
| -rw-r--r-- | usr/src/cmd/cmd-crypto/etc/certs/SUNWObjectCA.annot (renamed from usr/src/cmd/cmd-crypto/etc/certs/SUNWObjectCA) | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/usr/src/cmd/cmd-crypto/etc/Makefile b/usr/src/cmd/cmd-crypto/etc/Makefile index baa49d769e..7b600f0489 100644 --- a/usr/src/cmd/cmd-crypto/etc/Makefile +++ b/usr/src/cmd/cmd-crypto/etc/Makefile @@ -41,6 +41,9 @@ ETCCERTSFILES = \ SUNWSolarisCA \ SUNWObjectCA +ANNOTATEDFILES = \ + certs/SUNWObjectCA.annot + include ../../Makefile.cmd .KEEP_STATE: @@ -72,7 +75,7 @@ $(RELEASECRYPTO:%=$(ROOTCRYPTODIR)/certs/%): \ $(MV) $(@D)/$(@F:SUNW_SunOS_5.%=SUNWCryptographic%) $@ $(ROOTETCCERTSDIR)/SUNWObjectCA: \ - certs/$(@F) + certs/$$(@F) $(RM) $@ $(INS) -s -m $(FILEMODE) -f $(@D) certs/$(@F) $(ROOTETCCERTSDIR)/%: certs/% @@ -84,6 +87,13 @@ $(RELEASECERTS:%=$(ROOTETCCERTSDIR)/%): \ certs/$(@F:SUNW_SunOS_5.%=SUNWSolaris%) $(MV) $(@D)/$(@F:SUNW_SunOS_5.%=SUNWSolaris%) $@ +ANNOT_DEL = SOURCE ANNOTATION DELETE +$(ANNOTATEDFILES:%.annot=%): \ + $$(@:%=%.annot) + $(RM) $@ + $(SED) -e '/${ANNOT_DEL} START/,/${ANNOT_DEL} END/d' \ + $(@:%=%.annot) > $@ + $(IETCCRYPTOFILES):= FILEMODE= 644 $(IETCCRYPTOFILES):= OWNER= root $(IETCCRYPTOFILES):= GROUP= sys @@ -92,3 +102,6 @@ $(IETCCERTSFILES):= OWNER= root $(IETCCERTSFILES):= GROUP= sys install: $(IETCCRYPTOFILES) $(IETCCERTSFILES) + +clean clobber: + $(RM) $(ANNOTATEDFILES:%.annot=%) diff --git a/usr/src/cmd/cmd-crypto/etc/certs/SUNWObjectCA b/usr/src/cmd/cmd-crypto/etc/certs/SUNWObjectCA.annot index 81f66ba029..e9097e0021 100644 --- a/usr/src/cmd/cmd-crypto/etc/certs/SUNWObjectCA +++ b/usr/src/cmd/cmd-crypto/etc/certs/SUNWObjectCA.annot @@ -1,3 +1,4 @@ +SOURCE ANNOTATION DELETE START CDDL HEADER START The contents of this file are subject to the terms of the @@ -24,6 +25,7 @@ ident "%Z%%M% %I% %E% SMI" Subject: O=Sun Microsystems Inc, OU=VeriSign Trust Network, OU=Class 2 OnSite Subscriber CA, CN=Object Signing CA +SOURCE ANNOTATION DELETE END -----BEGIN CERTIFICATE----- MIIE5jCCA86gAwIBAgIQHiBGeRMOJw614tvYy3sSTTANBgkqhkiG9w0BAQUFADBn MR0wGwYDVQQKExRTdW4gTWljcm9zeXN0ZW1zIEluYzEfMB0GA1UECxMWVmVyaVNp |