Check-in [466549fe92]
Overview
Comment:Merged divergent PIV branches
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | piv
Files: files | file ages | folders
SHA1:466549fe9245870040711795df15ff3892ef2080
User & Date: rkeene on 2015-07-15 20:10:10
Other Links: manifest | tags
Context
2015-07-15
20:10
Merged divergent PIV branches Closed-Leaf check-in: 466549fe92 user: rkeene tags: piv
2013-10-17
20:29
Updated to deal with 6E00 and added support for win32 build options check-in: 6ba1dff55a user: rkeene tags: piv
2013-08-03
02:20
Updated to create a PKCS#7 bundle check-in: 0a6ef43f4c user: rkeene tags: piv
Changes

Modified build/certs/dod/Makefile from [678511107e] to [5a8397c00a].

     1         -all: cert-0.crt
            1  +all: certs USG-dod-bundle.pem
            2  +
            3  +certs: cert-0.crt
     2      4   
     3      5   rel3_dodroot_2048.cac:
     4      6   	wget -O "$@.new" http://dodpki.c3pki.chamb.disa.mil/rel3_dodroot_2048.cac
     5      7   	mv "$@.new" "$@"
     6      8   
     7      9   cert-%.crt: rel3_dodroot_2048.cac
     8     10   	idx=0; \
................................................................................
    14     16   		fi; \
    15     17   		echo "$${line}" >> "cert-$${idx}.crt"; \
    16     18   		if [ "$${line}" == "-----END CERTIFICATE-----" ]; then \
    17     19   			idx=$$[$$idx + 1]; \
    18     20   		fi; \
    19     21   	done
    20     22   
           23  +USG-dod-bundle.pem: certs
           24  +	../build-tree.sh > "$@"
           25  +
    21     26   clean:
    22     27   	rm -f cert-*.crt
    23     28   	rm -f rel3_dodroot_2048.cac.new
    24     29   
    25     30   distclean: clean
    26     31   	rm -f rel3_dodroot_2048.cac
           32  +
           33  +.PHONY: all certs

Modified build/certs/federal/Makefile from [7088ba1ceb] to [8dcfe9c94d].

     1         -all: cert-1.crt CPCA_TRCA.crt CommonPolicy.crt
            1  +all: certs USG-federal-bundle.pem
            2  +
            3  +certs: cert-1.crt CPCA_TRCA.crt CommonPolicy.crt
     2      4   	grep -l 'Issuer: C=US, O=U.S. Government, OU=FPKI, CN=Federal Bridge CA' *.crt | xargs rm -f
     3      5   	grep -l 'Subject: C=US, O=U.S. Government, OU=FPKI, CN=Federal Common Policy CA' *.crt  | xargs grep -H 'Issuer:' | grep -v 'Issuer: C=us, O=U.S. Government, OU=FBCA, CN=Common Policy' | cut -f 1 -d : | xargs rm -f
     4      6   
     5      7   CPCA_TRCA.crt:
     6      8   	wget -O - --no-check-certificate https://pki.treas.gov/CPCA_TRCA.cer | openssl x509 -text > "$@.new"
     7      9   	mv "$@.new" "$@"
     8     10   
................................................................................
    29     31   		fi; \
    30     32   		echo "$${line}" >> "cert-$${idx}.crt"; \
    31     33   		if [ "$${line}" == "-----END CERTIFICATE-----" ]; then \
    32     34   			idx=$$[$$idx + 1]; \
    33     35   		fi; \
    34     36   	done
    35     37   
           38  +USG-federal-bundle.pem: certs
           39  +	../build-tree.sh > "$@"
           40  +
           41  +USG-federal-bundle.pk7: USG-federal-bundle.pem
           42  +	openssl crl2pkcs7 -outform der -nocrl -certfile USG-federal-bundle.pem > USG-federal-bundle.pk7
           43  +
    36     44   clean:
    37         -	rm -f cert-*.crt
           45  +	rm -f cert-*.crt USG-federal-bundle.pem USG-federal-bundle.pk7
    38     46   	rm -f CPCA_TRCA.crt.new root_sia.p7b.new caCertsIssuedTofcpca.p7c.new CommonPolicy.crt.new
    39     47   
    40     48   distclean: clean
    41     49   	rm -f CPCA_TRCA.crt root_sia.p7b caCertsIssuedTofcpca.p7c CommonPolicy.crt
           50  +
           51  +.PHONY: all certs