diff -r 4fd8c15fddcf -r 9c200dad5ecc usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11.c
--- a/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11.c	Fri Sep 03 00:30:09 2010 -0700
+++ b/usr/src/lib/openssl/Patches/pkcs11-engine/hw_pk11.c	Mon Sep 20 06:25:02 2010 -0700
@@ -2,7 +2,7 @@
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
-#pragma ident	"@(#)hw_pk11.c	1.4	10/04/14 SMI"
+#pragma ident	"@(#)hw_pk11.c	1.5	10/09/01 SMI"
 
 /* crypto/engine/hw_pk11.c */
 /*
@@ -1372,6 +1372,26 @@
 #if 0
 	pFuncList->C_Finalize(NULL);
 #endif
+#ifdef	SOLARIS_AES_CTR
+	{
+		ASN1_OBJECT *ob = NULL;
+		if (NID_aes_128_ctr != NID_undef) {
+			ob = OBJ_nid2obj(NID_aes_128_ctr);
+			if (ob != NULL)
+				ASN1_OBJECT_free(ob);
+		}
+		if (NID_aes_192_ctr != NID_undef) {
+			ob = OBJ_nid2obj(NID_aes_192_ctr);
+			if (ob != NULL)
+				ASN1_OBJECT_free(ob);
+		}
+		if (NID_aes_256_ctr != NID_undef) {
+			ob = OBJ_nid2obj(NID_aes_256_ctr);
+			if (ob != NULL)
+				ASN1_OBJECT_free(ob);
+		}
+	}
+#endif
 
 	if (!DSO_free(pk11_dso))
 		{
@@ -3619,7 +3639,7 @@
 	int n_cipher = 0, n_digest = 0;
 	CK_FUNCTION_LIST_PTR pflist = NULL;
 	CK_SLOT_ID_PTR pSlotList = NULL_PTR;
-	int *tmp_hw_cnids, *tmp_hw_dnids;
+	int *tmp_hw_cnids = NULL, *tmp_hw_dnids = NULL;
 	int hw_ctable_size, hw_dtable_size;
 
 #ifdef	DEBUG_SLOT_SELECTION