diff --git a/security/nss/lib/ckfw/ckfw.h b/security/nss/lib/ckfw/ckfw.h
index 08b81e8b6ca2..bbb67a720060 100644
--- a/security/nss/lib/ckfw/ckfw.h
+++ b/security/nss/lib/ckfw/ckfw.h
@@ -38,7 +38,7 @@
 #define CKFW_H
 
 #ifdef DEBUG
-static const char CKFW_CVS_ID[] = "@(#) $RCSfile: ckfw.h,v $ $Revision: 1.8 $ $Date: 2005/12/16 00:48:01 $";
+static const char CKFW_CVS_ID[] = "@(#) $RCSfile: ckfw.h,v $ $Revision: 1.9 $ $Date: 2006/04/22 05:30:18 $";
 #endif /* DEBUG */
 
 /*
@@ -1655,6 +1655,17 @@ nssCKFWCryptoOperation_UpdateFinal
   NSSItem *outputBuffer
 );
 
+/*
+ * nssCKFWCryptoOperation_UpdateCombo
+ */
+NSS_EXTERN CK_RV
+nssCKFWCryptoOperation_UpdateCombo
+(
+  NSSCKFWCryptoOperation *fwOperation,
+  NSSCKFWCryptoOperation *fwPeerOperation,
+  NSSItem *inputBuffer,
+  NSSItem *outputBuffer
+);
 
 /*
  * NSSCKFWSession
diff --git a/security/nss/lib/ckfw/crypto.c b/security/nss/lib/ckfw/crypto.c
index 47f849f621d3..22ff200555de 100644
--- a/security/nss/lib/ckfw/crypto.c
+++ b/security/nss/lib/ckfw/crypto.c
@@ -36,7 +36,7 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifdef DEBUG
-static const char CVS_ID[] = "@(#) $RCSfile: crypto.c,v $ $Revision: 1.2 $ $Date: 2005/12/16 01:57:41 $";
+static const char CVS_ID[] = "@(#) $RCSfile: crypto.c,v $ $Revision: 1.3 $ $Date: 2006/04/22 05:30:18 $";
 #endif /* DEBUG */
 
 /*
@@ -347,7 +347,7 @@ nssCKFWCryptoOperation_UpdateFinal
 }
 
 /*
- * nssCKFWCryptoOperation_UpdateFinal
+ * nssCKFWCryptoOperation_UpdateCombo
  */
 NSS_EXTERN CK_RV
 nssCKFWCryptoOperation_UpdateCombo