--- a/components/openssl/openssl-1.0.1-fips-140/engines/pkcs11/e_pk11.h	Wed Feb 26 12:49:08 2014 -0800
+++ b/components/openssl/openssl-1.0.1-fips-140/engines/pkcs11/e_pk11.h	Thu Feb 27 07:51:20 2014 -0800
@@ -71,7 +71,11 @@
 
 #include "e_pk11_err.h"
 
-/* max byte length of a symetric key we support */
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+/* max byte length of a symmetric key we support */
 #define	PK11_KEY_LEN_MAX			32
 
 /*
@@ -172,7 +176,7 @@
  * different groups may be initialized in different slots.
  *
  * To provide locking granularity in multithreaded environment, the groups are
- * further splitted into types with each type having a separate session cache.
+ * further split into types with each type having a separate session cache.
  */
 typedef enum PK11_OPTYPE_ENUM
 	{
@@ -243,6 +247,13 @@
 extern DH_METHOD *PK11_DH(void);
 #endif /* OPENSSL_NO_DH */
 
+extern int pk11_engine_pkey_methods(ENGINE *e, EVP_PKEY_METHOD **pmeth,
+    const int **nids, int nid);
+
 extern CK_FUNCTION_LIST_PTR pFuncList;
 
+#ifdef	__cplusplus
+}
+#endif
+
 #endif /* E_PK11_H */