From 124dacb68531a7637900d791df92ecce593a4c9c Mon Sep 17 00:00:00 2001
From: "julien.pierre.boogz%sun.com"
 <julien.pierre.boogz%sun.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sat, 26 Apr 2008 00:49:15 +0000
Subject: [PATCH] Fix for bug 428103. Define CERT_EncodeSubjectKeyID in a
 public header. r=nelson

git-svn-id: svn://10.0.0.236/trunk@250821 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/nss/lib/certdb/cert.h   | 10 +++++++++-
 mozilla/security/nss/lib/certdb/xconst.h |  4 ----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/mozilla/security/nss/lib/certdb/cert.h b/mozilla/security/nss/lib/certdb/cert.h
index b79c4b7b013..2e53779f930 100644
--- a/mozilla/security/nss/lib/certdb/cert.h
+++ b/mozilla/security/nss/lib/certdb/cert.h
@@ -37,7 +37,7 @@
 /*
  * cert.h - public data structures and prototypes for the certificate library
  *
- * $Id: cert.h,v 1.68 2008-03-15 02:15:34 alexei.volkov.bugs%sun.com Exp $
+ * $Id: cert.h,v 1.69 2008-04-26 00:49:15 julien.pierre.boogz%sun.com Exp $
  */
 
 #ifndef _CERT_H_
@@ -549,6 +549,14 @@ CERT_FindCertByIssuerAndSN (CERTCertDBHandle *handle, CERTIssuerAndSN *issuerAnd
 extern CERTCertificate *
 CERT_FindCertBySubjectKeyID (CERTCertDBHandle *handle, SECItem *subjKeyID);
 
+/*
+** Encode Certificate SKID (Subject Key ID) extension.
+**
+*/
+extern SECStatus 
+CERT_EncodeSubjectKeyID(PRArenaPool *arena, const SECItem* srcString,
+                        SECItem *encodedValue);
+
 /*
 ** Find a certificate in the database by a nickname
 **	"nickname" is the ascii string nickname to look for
diff --git a/mozilla/security/nss/lib/certdb/xconst.h b/mozilla/security/nss/lib/certdb/xconst.h
index dfaf256b825..59cc0d76492 100644
--- a/mozilla/security/nss/lib/certdb/xconst.h
+++ b/mozilla/security/nss/lib/certdb/xconst.h
@@ -56,10 +56,6 @@ CERT_EncodeNameConstraintsExtension(PRArenaPool *arena,
                                     CERTNameConstraints  *value,
 			            SECItem *encodedValue);
 
-extern SECStatus 
-CERT_EncodeSubjectKeyID(PRArenaPool *arena, const SECItem* srcString,
-                        SECItem *encodedValue);
-
 extern SECStatus 
 CERT_EncodeIA5TypeExtension(PRArenaPool *arena, char *value, 
                             SECItem *encodedValue);