6589063 typo in 'possiblely' in pkcs#11 kernel/soft token

Contributed by Deepthi Devaki A R <deepthi_05cse14@students.amrita.ac.in> and R Vidya Lakshmi <vidyalakshmi_05cse56@students.amrita.ac.in>

4 files changed, 28 insertions, 34 deletions

diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/common/kernelAttributeUtil.c b/usr/src/lib/pkcs11/pkcs11_kernel/common/kernelAttributeUtil.c
index 84a38c6054..c53b09a00d 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/common/kernelAttributeUtil.c
+++ b/usr/src/lib/pkcs11/pkcs11_kernel/common/kernelAttributeUtil.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdlib.h>
 #include <string.h>
 #include <security/cryptoki.h>
@@ -3572,7 +3570,7 @@ kernel_copy_secret_key_attr(secret_key_obj_t *old_secret_key_obj_p,
  * of these attributes are in the template, make a list of classes
  * that can have these attributes.  This would speed up the search later,
  * because we can immediately skip an object if the class of that
- * object can not possiblely contain one of the attributes.
+ * object can not possibly contain one of the attributes.
  *
  */
 void
@@ -3710,7 +3708,7 @@ kernel_find_match_attrs(kernel_object_t *obj, CK_OBJECT_CLASS *pclasses,
 
 	/*
 	 * Check if the class of this object match with any
-	 * of object classes that can possiblely contain the
+	 * of object classes that can possibly contain the
 	 * requested attributes.
 	 */
 	if (num_pclasses > 0) {
@@ -3721,7 +3719,7 @@ kernel_find_match_attrs(kernel_object_t *obj, CK_OBJECT_CLASS *pclasses,
 		}
 		if (i == num_pclasses) {
 			/*
-			 * this object can't possiblely contain one or
+			 * this object can't possibly contain one or
 			 * more attributes, don't need to check this object
 			 */
 			return (B_FALSE);
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/common/kernelObjectUtil.c b/usr/src/lib/pkcs11/pkcs11_kernel/common/kernelObjectUtil.c
index c3a0ac4a94..23b20c958e 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/common/kernelObjectUtil.c
+++ b/usr/src/lib/pkcs11/pkcs11_kernel/common/kernelObjectUtil.c
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <strings.h>
@@ -425,7 +423,7 @@ kernel_delete_object_cleanup(kernel_object_t *objp)
 		 */
 		objp->obj_delete_sync |= OBJECT_REFCNT_WAITING;
 		(void) pthread_cond_wait(&objp->obj_free_cond,
-			&objp->object_mutex);
+		    &objp->object_mutex);
 	}
 
 	objp->obj_delete_sync &= ~OBJECT_REFCNT_WAITING;
@@ -594,7 +592,7 @@ search_for_objects(kernel_session_t *sp, CK_ATTRIBUTE_PTR pTemplate,
 {
 	kernel_session_t *session_p;
 	kernel_object_t *obj;
-	CK_OBJECT_CLASS pclasses[6]; /* classes attrs possiblely exist */
+	CK_OBJECT_CLASS pclasses[6]; /* classes attrs possibly exist */
 	CK_ULONG num_pclasses;	/* number of possible classes */
 	CK_ULONG num_result_alloc = 0; /* spaces allocated for results */
 	CK_RV rv = CKR_OK;
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softAttributeUtil.c b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softAttributeUtil.c
index c139863b23..fe7818c040 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softAttributeUtil.c
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softAttributeUtil.c
@@ -6311,7 +6311,7 @@ soft_copy_secret_key_attr(secret_key_obj_t *old_secret_key_obj_p,
  * of these attributes are in the template, make a list of classes
  * that can have these attributes.  This would speed up the search later,
  * because we can immediately skip an object if the class of that
- * object can not possiblely contain one of the attributes.
+ * object can not possibly contain one of the attributes.
  *
  */
 void
@@ -6450,7 +6450,7 @@ soft_find_match_attrs(soft_object_t *obj, CK_OBJECT_CLASS *pclasses,
 
 	/*
 	 * Check if the class of this object match with any
-	 * of object classes that can possiblely contain the
+	 * of object classes that can possibly contain the
 	 * requested attributes.
 	 */
 	if (num_pclasses > 0) {
@@ -6461,7 +6461,7 @@ soft_find_match_attrs(soft_object_t *obj, CK_OBJECT_CLASS *pclasses,
 		}
 		if (i == num_pclasses) {
 			/*
-			 * this object can't possiblely contain one or
+			 * this object can't possibly contain one or
 			 * more attributes, don't need to check this object
 			 */
 			return (B_FALSE);
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softObjectUtil.c b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softObjectUtil.c
index 7bfb92c529..b8abf29b03 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softObjectUtil.c
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softObjectUtil.c
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -449,7 +447,7 @@ soft_delete_object_cleanup(soft_object_t *objp)
 		 */
 		objp->obj_delete_sync |= OBJECT_REFCNT_WAITING;
 		(void) pthread_cond_wait(&objp->obj_free_cond,
-			&objp->object_mutex);
+		    &objp->object_mutex);
 	}
 
 	objp->obj_delete_sync &= ~OBJECT_REFCNT_WAITING;
@@ -587,7 +585,7 @@ search_for_objects(CK_ATTRIBUTE_PTR pTemplate, CK_ULONG ulCount,
 {
 	soft_session_t *session_p;
 	soft_object_t *obj;
-	CK_OBJECT_CLASS pclasses[6]; /* classes attrs possiblely exist */
+	CK_OBJECT_CLASS pclasses[6]; /* classes attrs possibly exist */
 	CK_ULONG num_pclasses;	/* number of possible classes */
 	CK_ULONG num_result_alloc = 0; /* spaces allocated for results */
 	CK_RV rv = CKR_OK;
@@ -979,7 +977,7 @@ soft_object_write_access_check(soft_session_t *sp, soft_object_t *objp)
 			 * object, but not for private token/session object.
 			 */
 			if ((objp->object_type == TOKEN_PRIVATE) ||
-				(objp->object_type == SESSION_PRIVATE)) {
+			    (objp->object_type == SESSION_PRIVATE)) {
 				return (CKR_USER_NOT_LOGGED_IN);
 			}
 		} else {
@@ -1256,24 +1254,24 @@ refresh_token_objects()
 	soft_object_t *in_core_obj, *tmp_incore_obj, *new_objp = NULL;
 	CK_RV rv = CKR_OK;
 
-			/* deleted in-core objects */
-	soft_object_t	*del_objs_list = NULL,
-			*end_del_objs_list = NULL,
+	/* deleted in-core objects */
+	soft_object_t *del_objs_list = NULL;
+	soft_object_t *end_del_objs_list = NULL;
 
-			/* modified in-core objects */
-			*mod_objs_list = NULL,
-			*end_mod_objs_list = NULL,
+	/* modified in-core objects */
+	soft_object_t *mod_objs_list = NULL;
+	soft_object_t *end_mod_objs_list = NULL;
 
-			/*
-			 * copy of modified in-core objects, in case we need
-			 * undo the change
-			 */
-			*copy_of_mod_objs_list = NULL,
-			*end_copy_of_mod_objs_list = NULL,
+	/*
+	 * copy of modified in-core objects, in case we need
+	 * undo the change
+	 */
+	soft_object_t *copy_of_mod_objs_list = NULL;
+	soft_object_t *end_copy_of_mod_objs_list = NULL;
 
-			/* objects to be added to the in-core list */
-			*added_objs_list = NULL,
-			*end_added_objs_list = NULL;
+	/* objects to be added to the in-core list */
+	soft_object_t *added_objs_list = NULL;
+	soft_object_t *end_added_objs_list = NULL;
 
 	if (soft_keystore_get_version(&on_disk_ks_version, B_FALSE) != 0) {
 		return (CKR_FUNCTION_FAILED);