diff options
author | Rich Megginson <rmeggins@redhat.com> | 2010-07-12 17:21:01 -0600 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2010-08-09 15:45:06 -0400 |
commit | a7e040fdf483b36e51a729895b6bb242a8fb1912 (patch) | |
tree | e57b0e7e9ad5941f738d6cbb431722a6c5b55952 | |
parent | ace20bb0f3932e6c404504085cd881c95128080e (diff) | |
download | pemnss-a7e040fdf483b36e51a729895b6bb242a8fb1912.tar.gz pemnss-a7e040fdf483b36e51a729895b6bb242a8fb1912.tar.xz pemnss-a7e040fdf483b36e51a729895b6bb242a8fb1912.zip |
Do not define SEC_SkipTemplate
Building NSS with PEM support gives an error in pbobject due to multiple
definitions of SEC_SkipTemplate. This is already defined in libnssutil
-rw-r--r-- | pobject.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -172,6 +172,8 @@ static const NSSItem pem_trusted = { (void *) &ckt_netscape_trusted, (PRUint32) sizeof(CK_TRUST) }; +/* SEC_SkipTemplate is already defined and exported by libnssutil */ +#ifdef SEC_SKIP_TEMPLATE /* * Template for skipping a subitem. * @@ -182,6 +184,7 @@ static const NSSItem pem_trusted = { const SEC_ASN1Template SEC_SkipTemplate[] = { {SEC_ASN1_SKIP} }; +#endif /* * Find the subjectName in a DER encoded certificate |