6784451 consolidate duplicative looping_read() and looping_write() code into libcryptoutil

12 files changed, 192 insertions, 369 deletions

diff --git a/usr/src/lib/libcryptoutil/common/cryptoutil.h b/usr/src/lib/libcryptoutil/common/cryptoutil.h
index 85896e398a..d041262129 100644
--- a/usr/src/lib/libcryptoutil/common/cryptoutil.h
+++ b/usr/src/lib/libcryptoutil/common/cryptoutil.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -148,6 +148,10 @@ extern int pkcs11_random_data(void *dbuf, size_t dlen);
 extern int pkcs11_nzero_random_data(void *dbuf, size_t dlen);
 extern int pkcs11_read_data(char *filename, void **dbuf, size_t *dlen);
 
+extern int open_nointr(const char *path, int oflag, ...);
+extern ssize_t readn_nointr(int fd, void *dbuf, size_t dlen);
+extern ssize_t writen_nointr(int fd, void *dbuf, size_t dlen);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/usr/src/lib/libcryptoutil/common/mapfile-vers b/usr/src/lib/libcryptoutil/common/mapfile-vers
index 4fb4647c7e..e7e5b12789 100644
--- a/usr/src/lib/libcryptoutil/common/mapfile-vers
+++ b/usr/src/lib/libcryptoutil/common/mapfile-vers
@@ -53,6 +53,7 @@ SUNWprivate {
 	get_metaslot_info;
 	get_pkcs11conf_info;
 	hexstr_to_bytes;
+	open_nointr;
 	pkcs11_default_token;
 	pkcs11_get_pass;
 	pkcs11_mech2keytype;
@@ -63,8 +64,10 @@ SUNWprivate {
 	pkcs11_read_data;
 	pkcs11_str2mech;
 	pkcs11_strerror;
+	readn_nointr;
 	str2lifetime;
 	tohexstr;
+	writen_nointr;
     local:
 	*;
 };
diff --git a/usr/src/lib/libcryptoutil/common/random.c b/usr/src/lib/libcryptoutil/common/random.c
index 6d91dbfea4..5a254ed34d 100644
--- a/usr/src/lib/libcryptoutil/common/random.c
+++ b/usr/src/lib/libcryptoutil/common/random.c
@@ -19,18 +19,17 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
 #include <fcntl.h>
 #include <locale.h>
+#include <stdarg.h>
 #include <cryptoutil.h>
 
 #ifdef	_REENTRANT
@@ -60,13 +59,19 @@ static int	urandom_fd = -1;
  * Equivalent of open(2) insulated from EINTR.
  * Also sets close-on-exec.
  */
-static int
-OPEN(const char *path, int oflag)
+int
+open_nointr(const char *path, int oflag, ...)
 {
 	int	fd;
+	mode_t	pmode;
+	va_list	alist;
+
+	va_start(alist, oflag);
+	pmode = va_arg(alist, mode_t);
+	va_end(alist);
 
 	do {
-		if ((fd = open(path, oflag)) >= 0) {
+		if ((fd = open(path, oflag, pmode)) >= 0) {
 			(void) fcntl(fd, F_SETFD, FD_CLOEXEC);
 			break;
 		}
@@ -78,8 +83,8 @@ OPEN(const char *path, int oflag)
 /*
  * Equivalent of read(2) insulated from EINTR.
  */
-static ssize_t
-READ(int fd, void *dbuf, size_t dlen)
+ssize_t
+readn_nointr(int fd, void *dbuf, size_t dlen)
 {
 	char	*marker = dbuf;
 	size_t	left = dlen;
@@ -93,6 +98,34 @@ READ(int fd, void *dbuf, size_t dlen)
 			}
 			err = nread;		/* hard error */
 			break;
+		} else if (nread == 0) {
+			break;
+		}
+	}
+	return (err != 0 ? err : dlen - left);
+}
+
+/*
+ * Equivalent of write(2) insulated from EINTR.
+ */
+ssize_t
+writen_nointr(int fd, void *dbuf, size_t dlen)
+{
+	char	*marker = dbuf;
+	size_t	left = dlen;
+	ssize_t	nwrite = 0, err;
+
+	for (err = 0; left > 0 && nwrite != -1; marker += nwrite,
+	    left -= nwrite) {
+		if ((nwrite = write(fd, marker, left)) < 0) {
+			if (errno == EINTR) {	/* keep trying */
+				nwrite = 0;
+				continue;
+			}
+			err = nwrite;		/* hard error */
+			break;
+		} else if (nwrite == 0) {
+			break;
 		}
 	}
 	return (err != 0 ? err : dlen - left);
@@ -107,7 +140,7 @@ pkcs11_open_random(void)
 {
 	RAND_LOCK(&random_mutex);
 	if (random_fd < 0)
-		random_fd = OPEN(RANDOM_DEVICE, O_RDONLY);
+		random_fd = open_nointr(RANDOM_DEVICE, O_RDONLY);
 	RAND_UNLOCK(&random_mutex);
 	return (random_fd);
 }
@@ -117,7 +150,7 @@ pkcs11_open_urandom(void)
 {
 	RAND_LOCK(&urandom_mutex);
 	if (urandom_fd < 0)
-		urandom_fd = OPEN(URANDOM_DEVICE, O_RDONLY);
+		urandom_fd = open_nointr(URANDOM_DEVICE, O_RDONLY);
 	RAND_UNLOCK(&urandom_mutex);
 	return (urandom_fd);
 }
@@ -161,7 +194,7 @@ pkcs11_random_data(void *dbuf, size_t dlen)
 	if (pkcs11_open_urandom() < 0)
 		return (-1);
 
-	if (READ(urandom_fd, dbuf, dlen) == dlen)
+	if (readn_nointr(urandom_fd, dbuf, dlen) == dlen)
 		return (0);
 	return (-1);
 }
diff --git a/usr/src/lib/pkcs11/libpkcs11/common/metaGeneral.c b/usr/src/lib/pkcs11/libpkcs11/common/metaGeneral.c
index 5f16e7727f..3df701d2eb 100644
--- a/usr/src/lib/pkcs11/libpkcs11/common/metaGeneral.c
+++ b/usr/src/lib/pkcs11/libpkcs11/common/metaGeneral.c
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * General-Purpose Functions
  * (as defined in PKCS#11 spec section 11.4)
@@ -293,58 +291,3 @@ meta_CancelFunction(CK_SESSION_HANDLE hSession)
 {
 	return (CKR_FUNCTION_NOT_PARALLEL);
 }
-
-/*
- * Perform a write that can handle EINTR.
- */
-int
-looping_write(int fd, void *buf, int len)
-{
-	char *p = buf;
-	int cc, len2 = 0;
-
-	if (len == 0)
-		return (0);
-
-	do {
-		cc = write(fd, p, len);
-		if (cc < 0) {
-			if (errno == EINTR)
-				continue;
-			return (cc);
-		} else if (cc == 0) {
-			return (len2);
-		} else {
-			p += cc;
-			len2 += cc;
-			len -= cc;
-		}
-	} while (len > 0);
-	return (len2);
-}
-
-/*
- * Perform a read that can handle EINTR.
- */
-int
-looping_read(int fd, void *buf, int len)
-{
-	char *p = buf;
-	int cc, len2 = 0;
-
-	do {
-		cc = read(fd, p, len);
-		if (cc < 0) {
-			if (errno == EINTR)
-				continue;
-			return (cc);	/* errno is already set */
-		} else if (cc == 0) {
-			return (len2);
-		} else {
-			p += cc;
-			len2 += cc;
-			len -= cc;
-		}
-	} while (len > 0);
-	return (len2);
-}
diff --git a/usr/src/lib/pkcs11/libpkcs11/common/metaGlobal.h b/usr/src/lib/pkcs11/libpkcs11/common/metaGlobal.h
index 74227412f7..8c3b92d0ff 100644
--- a/usr/src/lib/pkcs11/libpkcs11/common/metaGlobal.h
+++ b/usr/src/lib/pkcs11/libpkcs11/common/metaGlobal.h
@@ -694,9 +694,6 @@ boolean_t meta_slotManager_token_write_protected(void);
 boolean_t metaslot_logged_in();
 void metaslot_set_logged_in_flag(boolean_t value);
 
-int looping_read(int, void *, int);
-int looping_write(int, void *, int);
-
 /*
  * Prototypes for the various meta_Foo implementations of C_Foo.
  *
diff --git a/usr/src/lib/pkcs11/libpkcs11/common/metaObjectManager.c b/usr/src/lib/pkcs11/libpkcs11/common/metaObjectManager.c
index 43febf4f8a..f3cea9dad2 100644
--- a/usr/src/lib/pkcs11/libpkcs11/common/metaObjectManager.c
+++ b/usr/src/lib/pkcs11/libpkcs11/common/metaObjectManager.c
@@ -1307,23 +1307,20 @@ clone_by_wrap(meta_object_t *object, slot_object_t *new_clone,
 		 */
 		int fd;
 
-		while ((fd = open(RANDOM_DEVICE, O_RDONLY)) < 0) {
-			if (errno != EINTR)
-				break;
-		}
+		fd = open_nointr(RANDOM_DEVICE, O_RDONLY);
 		if (fd == -1) {
 			rv = CKR_FUNCTION_FAILED;
 			goto finish;
 		}
 		key_len = wrap_info.key_length;
 
-		if (looping_read(fd, key_data, key_len) != key_len) {
+		if (readn_nointr(fd, key_data, key_len) != key_len) {
 			rv = CKR_FUNCTION_FAILED;
 			goto finish;
 		}
 
 		if (wrap_info.iv_length > 0) {
-			if (looping_read(fd, ivbuf, wrap_info.iv_length)
+			if (readn_nointr(fd, ivbuf, wrap_info.iv_length)
 			    != wrap_info.iv_length) {
 				rv = CKR_FUNCTION_FAILED;
 				goto finish;
diff --git a/usr/src/lib/pkcs11/libpkcs11/common/metaRand.c b/usr/src/lib/pkcs11/libpkcs11/common/metaRand.c
index ec3b9ad70d..402ef7ce19 100644
--- a/usr/src/lib/pkcs11/libpkcs11/common/metaRand.c
+++ b/usr/src/lib/pkcs11/libpkcs11/common/metaRand.c
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Random Number Generation Functions
  * (as defined in PKCS#11 spec section 11.15)
@@ -74,27 +72,21 @@ meta_SeedRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed,
 
 	if (meta_urandom_seed_fd < 0) {
 		(void) pthread_mutex_lock(&initmutex);
-			/* Check again holding the mutex */
+		/* Check again holding the mutex */
+		if (meta_urandom_seed_fd < 0) {
+			meta_urandom_seed_fd = open_nointr(RANDOM_DEVICE,
+			    O_WRONLY);
 			if (meta_urandom_seed_fd < 0) {
-				while ((meta_urandom_seed_fd = open(
-				    RANDOM_DEVICE, O_WRONLY)) < 0) {
-					if (errno != EINTR)
-						break;
-				}
-				if (meta_urandom_seed_fd < 0) {
-					(void) pthread_mutex_unlock(&initmutex);
-					if (errno == EACCES)
-						return (
-						CKR_RANDOM_SEED_NOT_SUPPORTED);
-					return (CKR_DEVICE_ERROR);
-				}
-				(void) fcntl(meta_urandom_seed_fd, F_SETFD,
-				    FD_CLOEXEC);
+				(void) pthread_mutex_unlock(&initmutex);
+				if (errno == EACCES)
+					return (CKR_RANDOM_SEED_NOT_SUPPORTED);
+				return (CKR_DEVICE_ERROR);
 			}
+		}
 		(void) pthread_mutex_unlock(&initmutex);
 	}
 
-	n = looping_write(meta_urandom_seed_fd, pSeed, ulSeedLen);
+	n = writen_nointr(meta_urandom_seed_fd, pSeed, ulSeedLen);
 	if (n <= 0) {
 		return (CKR_DEVICE_ERROR);
 	}
@@ -130,15 +122,12 @@ meta_GenerateRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pRandomData,
 		return (rv);
 	REFRELEASE(session);
 
-	while ((fd = open(RANDOM_DEVICE, O_RDONLY)) < 0) {
-		if (errno != EINTR)
-			break;
-	}
+	fd = open_nointr(RANDOM_DEVICE, O_RDONLY);
 	if (fd == -1) {
 		return (CKR_DEVICE_ERROR);
 	}
 
-	n = looping_read(fd, pRandomData, ulRandomLen);
+	n = readn_nointr(fd, pRandomData, ulRandomLen);
 	if (n <= 0) {
 		(void) close(fd);
 		return (CKR_DEVICE_ERROR);
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softGeneral.c b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softGeneral.c
index 86a9576cc3..d215dc11e2 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softGeneral.c
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softGeneral.c
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <strings.h>
 #include <errno.h>
 #include <cryptoutil.h>
@@ -462,35 +460,6 @@ C_CancelFunction(CK_SESSION_HANDLE hSession)
 }
 
 /*
- * Perform a write that can handle EINTR.
- */
-int
-looping_write(int fd, void *buf, int len)
-{
-	char *p = buf;
-	int cc, len2 = 0;
-
-	if (len == 0)
-		return (0);
-
-	do {
-		cc = write(fd, p, len);
-		if (cc < 0) {
-			if (errno == EINTR)
-				continue;
-			return (cc);
-		} else if (cc == 0) {
-			return (len2);
-		} else {
-			p += cc;
-			len2 += cc;
-			len -= cc;
-		}
-	} while (len > 0);
-	return (len2);
-}
-
-/*
  * Take out all mutexes before fork.
  * Order:
  * 1. soft_giant_mutex
@@ -538,29 +507,3 @@ softtoken_fork_child()
 	(void) pthread_mutex_unlock(&soft_sessionlist_mutex);
 	(void) pthread_mutex_unlock(&soft_giant_mutex);
 }
-
-/*
- * Perform a read that can handle EINTR.
- */
-int
-looping_read(int fd, void *buf, int len)
-{
-	char *p = buf;
-	int cc, len2 = 0;
-
-	do {
-		cc = read(fd, p, len);
-		if (cc < 0) {
-			if (errno == EINTR)
-				continue;
-			return (cc);	/* errno is already set */
-		} else if (cc == 0) {
-			return (len2);
-		} else {
-			p += cc;
-			len2 += cc;
-			len -= cc;
-		}
-	} while (len > 0);
-	return (len2);
-}
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softGlobal.h b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softGlobal.h
index 476847a97c..bbb4d73152 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softGlobal.h
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softGlobal.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,13 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #ifndef _SOFTGLOBAL_H
 #define	_SOFTGLOBAL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -73,9 +70,6 @@ extern struct ses_to_be_freed_list ses_delay_freed;
 				CKF_DUAL_CRYPTO_OPERATIONS|\
 				CKF_TOKEN_INITIALIZED
 
-extern int looping_read(int, void *, int);
-extern int looping_write(int, void *, int);
-
 #ifdef	__cplusplus
 }
 #endif
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softKeystoreUtil.c b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softKeystoreUtil.c
index 2fead14840..1b30da9021 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softKeystoreUtil.c
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softKeystoreUtil.c
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  * Functions used for manipulating the keystore
  */
@@ -259,7 +257,7 @@ calculate_hashed_pin_offset(int fd)
 		return (-1);
 	}
 
-	if (looping_read(fd, (char *)&salt_length,
+	if (readn_nointr(fd, (char *)&salt_length,
 	    KS_HASHED_PIN_SALT_LEN_SIZE) != KS_HASHED_PIN_SALT_LEN_SIZE) {
 		return (-1);
 	}
@@ -369,11 +367,8 @@ create_keystore()
 	}
 
 	/* create keystore description file */
-	while ((fd = open(get_desc_file_path(ks_desc_file),
-	    O_RDWR|O_CREAT|O_EXCL|O_NONBLOCK, S_IRUSR|S_IWUSR)) < 0) {
-		if (errno != EINTR)
-			break;
-	}
+	fd = open_nointr(get_desc_file_path(ks_desc_file),
+	    O_RDWR|O_CREAT|O_EXCL|O_NONBLOCK, S_IRUSR|S_IWUSR);
 	if (fd < 0) {
 		if (errno == EEXIST) {
 			return (0);
@@ -384,9 +379,6 @@ create_keystore()
 		}
 	}
 
-	/* Mark fd as "close on exec" */
-	(void) fcntl(fd, F_SETFD, FD_CLOEXEC);
-
 	if (lock_file(fd, B_FALSE, B_TRUE) != 0) {
 		(void) unlink(ks_desc_file);
 		(void) close(fd);
@@ -419,33 +411,33 @@ create_keystore()
 	/* write file format release number */
 	bzero(ver_buf, sizeof (ver_buf));
 	(void) strcpy((char *)ver_buf, KS_PKCS11_VER);
-	if ((looping_write(fd, (char *)ver_buf, sizeof (ver_buf)))
+	if ((writen_nointr(fd, (char *)ver_buf, sizeof (ver_buf)))
 	    != sizeof (ver_buf)) {
 		goto cleanup;
 	}
 
 	/* write version number, version = 0 since keystore just created */
 	buf = SWAP32(0);
-	if (looping_write(fd, (void *)&buf, KS_VER_SIZE) != KS_VER_SIZE) {
+	if (writen_nointr(fd, (void *)&buf, KS_VER_SIZE) != KS_VER_SIZE) {
 		goto cleanup;
 	}
 
 	/* write monotonic-counter.  Counter for keystore objects start at 1 */
 	buf = SWAP32(1);
-	if (looping_write(fd, (void *)&buf, KS_COUNTER_SIZE)
+	if (writen_nointr(fd, (void *)&buf, KS_COUNTER_SIZE)
 	    != KS_COUNTER_SIZE) {
 		goto cleanup;
 	}
 
 	/* initial encryption key salt should be all NULL */
 	bzero(salt, sizeof (salt));
-	if (looping_write(fd, (void *)salt, KS_KEY_SALT_SIZE)
+	if (writen_nointr(fd, (void *)salt, KS_KEY_SALT_SIZE)
 	    != KS_KEY_SALT_SIZE) {
 		goto cleanup;
 	}
 
 	/* initial HMAC key salt should also be all NULL */
-	if (looping_write(fd, (void *)salt, KS_HMAC_SALT_SIZE)
+	if (writen_nointr(fd, (void *)salt, KS_HMAC_SALT_SIZE)
 	    != KS_HMAC_SALT_SIZE) {
 		goto cleanup;
 	}
@@ -465,24 +457,24 @@ create_keystore()
 
 	/* write hashed pin salt length */
 	ulong_buf = SWAP64(hashed_pin_salt_len);
-	if (looping_write(fd, (void *)&ulong_buf, KS_HASHED_PIN_SALT_LEN_SIZE)
+	if (writen_nointr(fd, (void *)&ulong_buf, KS_HASHED_PIN_SALT_LEN_SIZE)
 	    != KS_HASHED_PIN_SALT_LEN_SIZE) {
 		goto cleanup;
 	}
 
-	if (looping_write(fd, (void *)hashed_pin_salt,
+	if (writen_nointr(fd, (void *)hashed_pin_salt,
 	    hashed_pin_salt_len) != hashed_pin_salt_len) {
 		goto cleanup;
 	}
 
 	/* write MD5 hashed pin of the default pin */
 	ulong_buf = SWAP64(hashed_pin_len);
-	if (looping_write(fd, (void *)&ulong_buf, KS_HASHED_PINLEN_SIZE)
+	if (writen_nointr(fd, (void *)&ulong_buf, KS_HASHED_PINLEN_SIZE)
 	    != KS_HASHED_PINLEN_SIZE) {
 		goto cleanup;
 	}
 
-	if (looping_write(fd, (void *)hashed_pin, hashed_pin_len)
+	if (writen_nointr(fd, (void *)hashed_pin, hashed_pin_len)
 	    != hashed_pin_len) {
 		goto cleanup;
 	}
@@ -491,7 +483,7 @@ create_keystore()
 
 	(void) close(fd);
 	if (hashed_pin_salt)
-	    free(hashed_pin_salt);
+		free(hashed_pin_salt);
 	return (0);
 
 cleanup:
@@ -575,16 +567,11 @@ acquire_file_lock(int *fd, char *fname, mode_t mode) {
 		(void) close(*fd);
 
 		/* re-open */
-		while ((*fd = open(fname, mode|O_NONBLOCK)) < 0) {
-			if (errno != EINTR)
-				break;
-		}
+		*fd = open_nointr(fname, mode|O_NONBLOCK);
 		if (*fd < 0) {
 			return (-1);
 		}
 
-		(void) fcntl(*fd, F_SETFD, FD_CLOEXEC);
-
 		/* acquire lock again */
 		if (lock_file(*fd, read_lock, B_TRUE) != 0) {
 			return (-1);
@@ -615,29 +602,19 @@ open_and_lock_keystore_desc(mode_t mode, boolean_t do_create_keystore,
 
 	/* open the keystore description file in requested mode */
 	fname = get_desc_file_path(ks_desc_file);
-	while ((fd = open(fname, mode|O_NONBLOCK)) < 0) {
-		if (errno != EINTR)
-			break;
-	}
+	fd = open_nointr(fname, mode|O_NONBLOCK);
 	if (fd < 0) {
 		if ((errno == ENOENT) && (do_create_keystore)) {
 			if (create_keystore() < 0) {
 				goto done;
 			}
-			while ((fd = open(fname, mode|O_NONBLOCK)) < 0) {
-				if (errno != EINTR)
-					break;
-			}
+			fd = open_nointr(fname, mode|O_NONBLOCK);
 			if (fd < 0) {
 				goto done;
-			} else {
-				(void) fcntl(fd, F_SETFD, FD_CLOEXEC);
 			}
 		} else {
 			goto done;
 		}
-	} else {
-		(void) fcntl(fd, F_SETFD, FD_CLOEXEC);
 	}
 
 	if (lock_held) {
@@ -725,16 +702,11 @@ open_and_lock_object_file(ks_obj_handle_t *ks_handle, int oflag,
 		    get_pri_obj_path(pri_obj_path), ks_handle->name);
 	}
 
-	while ((fd = open(obj_fname, oflag|O_NONBLOCK)) < 0) {
-		if (errno != EINTR)
-			break;
-	}
+	fd = open_nointr(obj_fname, oflag|O_NONBLOCK);
 	if (fd < 0) {
 		return (-1);
 	}
 
-	(void) fcntl(fd, F_SETFD, FD_CLOEXEC);
-
 	if (lock_held) {
 		/* already hold the lock */
 		return (fd);
@@ -771,15 +743,11 @@ create_updated_keystore_version(int fd, char *tmp_fname)
 	size_t nread;
 
 	/* first, create the tempoary file */
-	while ((tmp_fd = open(tmp_fname,
-	    O_WRONLY|O_CREAT|O_EXCL|O_NONBLOCK, S_IRUSR|S_IWUSR)) < 0) {
-		if (errno != EINTR)
-			break;
-	}
+	tmp_fd = open_nointr(tmp_fname,
+	    O_WRONLY|O_CREAT|O_EXCL|O_NONBLOCK, S_IRUSR|S_IWUSR);
 	if (tmp_fd < 0) {
 		return (-1);
 	}
-	(void) fcntl(tmp_fd, F_SETFD, FD_CLOEXEC);
 
 	/*
 	 * copy everything from keystore version to temp file except
@@ -788,19 +756,19 @@ create_updated_keystore_version(int fd, char *tmp_fname)
 	 */
 
 	/* pkcs11 version */
-	if (looping_read(fd, buf, KS_PKCS11_VER_SIZE) != KS_PKCS11_VER_SIZE) {
+	if (readn_nointr(fd, buf, KS_PKCS11_VER_SIZE) != KS_PKCS11_VER_SIZE) {
 		goto cleanup;
 	}
 
-	if (looping_write(tmp_fd, buf, KS_PKCS11_VER_SIZE)
-	    != KS_PKCS11_VER_SIZE) {
+	if (writen_nointr(tmp_fd, buf, KS_PKCS11_VER_SIZE) !=
+	    KS_PKCS11_VER_SIZE) {
 		goto cleanup;
 	}
 
 	/* version number, it needs to be updated */
 
 	/* read the current version number */
-	if (looping_read(fd, &version, KS_VER_SIZE) != KS_VER_SIZE) {
+	if (readn_nointr(fd, &version, KS_VER_SIZE) != KS_VER_SIZE) {
 		goto cleanup;
 	}
 
@@ -809,18 +777,18 @@ create_updated_keystore_version(int fd, char *tmp_fname)
 	version = SWAP32(version);
 
 	/* write the updated value to the tmp file */
-	if (looping_write(tmp_fd, (void *)&version, KS_VER_SIZE)
+	if (writen_nointr(tmp_fd, (void *)&version, KS_VER_SIZE)
 	    != KS_VER_SIZE) {
 		goto cleanup;
 	}
 
 	/* read rest of information, nothing needs to be updated */
-	nread = looping_read(fd, buf, BUFSIZ);
+	nread = readn_nointr(fd, buf, BUFSIZ);
 	while (nread > 0) {
-		if (looping_write(tmp_fd, buf, nread) != nread) {
+		if (writen_nointr(tmp_fd, buf, nread) != nread) {
 			goto cleanup;
 		}
-		nread = looping_read(fd, buf, BUFSIZ);
+		nread = readn_nointr(fd, buf, BUFSIZ);
 	}
 
 	(void) close(tmp_fd);
@@ -924,7 +892,7 @@ get_hashed_pin(int fd, char **hashed_pin)
 		return (CKR_FUNCTION_FAILED);
 	}
 
-	if (looping_read(fd, (char *)&hashed_pin_size,
+	if (readn_nointr(fd, (char *)&hashed_pin_size,
 	    KS_HASHED_PINLEN_SIZE) != KS_HASHED_PINLEN_SIZE) {
 		return (CKR_FUNCTION_FAILED);
 	}
@@ -936,7 +904,7 @@ get_hashed_pin(int fd, char **hashed_pin)
 		return (CKR_HOST_MEMORY);
 	}
 
-	if ((looping_read(fd, *hashed_pin, hashed_pin_size))
+	if ((readn_nointr(fd, *hashed_pin, hashed_pin_size))
 	    != (ssize_t)hashed_pin_size) {
 		free(*hashed_pin);
 		*hashed_pin = NULL;
@@ -1090,7 +1058,7 @@ soft_keystore_get_version(uint_t *version, boolean_t lock_held)
 		goto cleanup;
 	}
 
-	if (looping_read(fd, (char *)&buf, KS_VER_SIZE) != KS_VER_SIZE) {
+	if (readn_nointr(fd, (char *)&buf, KS_VER_SIZE) != KS_VER_SIZE) {
 		ret_val = -1;
 		goto cleanup;
 	}
@@ -1143,7 +1111,7 @@ soft_keystore_get_object_version(ks_obj_handle_t *ks_handle,
 	 * read version.  Version is always first item in object file
 	 * so, no need to do lseek
 	 */
-	if (looping_read(fd, (char *)&tmp, OBJ_VER_SIZE) != OBJ_VER_SIZE) {
+	if (readn_nointr(fd, (char *)&tmp, OBJ_VER_SIZE) != OBJ_VER_SIZE) {
 		ret_val = -1;
 		goto cleanup;
 	}
@@ -1233,7 +1201,7 @@ read_obj_data(int old_fd, char **buf, ssize_t *bytes_read)
 		return (CKR_HOST_MEMORY);
 	}
 
-	nread = looping_read(old_fd, *buf, BUFSIZ);
+	nread = readn_nointr(old_fd, *buf, BUFSIZ);
 	if (nread < 0) {
 		free(*buf);
 		return (CKR_FUNCTION_FAILED);
@@ -1250,7 +1218,7 @@ read_obj_data(int old_fd, char **buf, ssize_t *bytes_read)
 			return (CKR_HOST_MEMORY);
 		}
 		*buf = buf1;
-		nread_tmp = looping_read(old_fd,
+		nread_tmp = readn_nointr(old_fd,
 		    *buf + ((loop_count - 1) * BUFSIZ), BUFSIZ);
 		if (nread_tmp < 0) {
 			free(*buf);
@@ -1285,16 +1253,11 @@ reencrypt_obj(soft_object_t *new_enc_key, soft_object_t *new_hmac_key,
 	CK_ULONG decrypted_len, encrypted_len, hmac_len;
 	CK_BYTE hmac[OBJ_HMAC_SIZE], *decrypted_buf = NULL, *buf = NULL;
 
-	while ((old_fd = open(orig_obj_name, O_RDONLY|O_NONBLOCK)) < 0) {
-		if (errno != EINTR)
-			break;
-	}
+	old_fd = open_nointr(orig_obj_name, O_RDONLY|O_NONBLOCK);
 	if (old_fd < 0) {
 		return (-1);
 	}
 
-	(void) fcntl(old_fd, F_SETFD, FD_CLOEXEC);
-
 	if (acquire_file_lock(&old_fd, orig_obj_name, O_RDONLY) != 0) {
 		if (old_fd > 0) {
 			(void) close(old_fd);
@@ -1302,18 +1265,13 @@ reencrypt_obj(soft_object_t *new_enc_key, soft_object_t *new_hmac_key,
 		return (-1);
 	}
 
-	while ((new_fd = open(new_obj_name,
-	    O_WRONLY|O_CREAT|O_EXCL|O_NONBLOCK, S_IRUSR|S_IWUSR)) < 0) {
-			if (errno != EINTR)
-				break;
-	}
+	new_fd = open_nointr(new_obj_name,
+	    O_WRONLY|O_CREAT|O_EXCL|O_NONBLOCK, S_IRUSR|S_IWUSR);
 	if (new_fd < 0) {
 		(void) close(old_fd);
 		return (-1);
 	}
 
-	(void) fcntl(new_fd, F_SETFD, FD_CLOEXEC);
-
 	if (lock_file(new_fd, B_FALSE, B_TRUE) != 0) {
 		/* unlock old file */
 		(void) lock_file(old_fd, B_TRUE, B_FALSE);
@@ -1323,7 +1281,7 @@ reencrypt_obj(soft_object_t *new_enc_key, soft_object_t *new_hmac_key,
 	}
 
 	/* read version, increment, and write to tmp file */
-	if (looping_read(old_fd, (char *)&version, OBJ_VER_SIZE)
+	if (readn_nointr(old_fd, (char *)&version, OBJ_VER_SIZE)
 	    != OBJ_VER_SIZE) {
 		goto cleanup;
 	}
@@ -1332,13 +1290,13 @@ reencrypt_obj(soft_object_t *new_enc_key, soft_object_t *new_hmac_key,
 	version++;
 	version = SWAP32(version);
 
-	if (looping_write(new_fd, (char *)&version, OBJ_VER_SIZE)
+	if (writen_nointr(new_fd, (char *)&version, OBJ_VER_SIZE)
 	    != OBJ_VER_SIZE) {
 		goto cleanup;
 	}
 
 	/* read old iv */
-	if (looping_read(old_fd, (char *)old_iv, OBJ_IV_SIZE) != OBJ_IV_SIZE) {
+	if (readn_nointr(old_fd, (char *)old_iv, OBJ_IV_SIZE) != OBJ_IV_SIZE) {
 		goto cleanup;
 	}
 
@@ -1347,7 +1305,7 @@ reencrypt_obj(soft_object_t *new_enc_key, soft_object_t *new_hmac_key,
 		goto cleanup;
 	}
 
-	if (looping_write(new_fd, (char *)iv, OBJ_IV_SIZE) != OBJ_IV_SIZE) {
+	if (writen_nointr(new_fd, (char *)iv, OBJ_IV_SIZE) != OBJ_IV_SIZE) {
 		goto cleanup;
 	}
 
@@ -1421,14 +1379,14 @@ reencrypt_obj(soft_object_t *new_enc_key, soft_object_t *new_hmac_key,
 	}
 
 	/* write new hmac */
-	if (looping_write(new_fd, (char *)hmac, OBJ_HMAC_SIZE)
+	if (writen_nointr(new_fd, (char *)hmac, OBJ_HMAC_SIZE)
 	    != OBJ_HMAC_SIZE) {
 		free(buf);
 		goto cleanup;
 	}
 
 	/* write re-encrypted buffer to temp file */
-	if (looping_write(new_fd, (void *)buf, encrypted_len)
+	if (writen_nointr(new_fd, (void *)buf, encrypted_len)
 	    != encrypted_len) {
 		free(buf);
 		goto cleanup;
@@ -1514,30 +1472,26 @@ soft_keystore_setpin(uchar_t *oldpin, uchar_t *newpin, boolean_t lock_held)
 	 * create a tempoary file for the keystore description
 	 * file for updating version and counter information
 	 */
-	while ((tmp_ks_fd = open(tmp_ks_desc_name,
-	    O_RDWR|O_CREAT|O_EXCL|O_NONBLOCK, S_IRUSR|S_IWUSR)) < 0) {
-		if (errno != EINTR)
-			break;
-	}
+	tmp_ks_fd = open_nointr(tmp_ks_desc_name,
+	    O_RDWR|O_CREAT|O_EXCL|O_NONBLOCK, S_IRUSR|S_IWUSR);
 	if (tmp_ks_fd < 0) {
 		(void) close(fd);
 		return (-1);
 	}
-	(void) fcntl(tmp_ks_fd, F_SETFD, FD_CLOEXEC);
 
 	/* read and write PKCS version to temp file */
-	if (looping_read(fd, filebuf, KS_PKCS11_VER_SIZE)
+	if (readn_nointr(fd, filebuf, KS_PKCS11_VER_SIZE)
 	    != KS_PKCS11_VER_SIZE) {
 		goto cleanup;
 	}
 
-	if (looping_write(tmp_ks_fd, filebuf, KS_PKCS11_VER_SIZE)
+	if (writen_nointr(tmp_ks_fd, filebuf, KS_PKCS11_VER_SIZE)
 	    != KS_PKCS11_VER_SIZE) {
 		goto cleanup;
 	}
 
 	/* get version number, and write updated number to temp file */
-	if (looping_read(fd, &version, KS_VER_SIZE) != KS_VER_SIZE) {
+	if (readn_nointr(fd, &version, KS_VER_SIZE) != KS_VER_SIZE) {
 		goto cleanup;
 	}
 
@@ -1545,18 +1499,18 @@ soft_keystore_setpin(uchar_t *oldpin, uchar_t *newpin, boolean_t lock_held)
 	version++;
 	version = SWAP32(version);
 
-	if (looping_write(tmp_ks_fd, (void *)&version, KS_VER_SIZE)
+	if (writen_nointr(tmp_ks_fd, (void *)&version, KS_VER_SIZE)
 	    != KS_VER_SIZE) {
 		goto cleanup;
 	}
 
 
 	/* read and write counter, no modification necessary */
-	if (looping_read(fd, filebuf, KS_COUNTER_SIZE) != KS_COUNTER_SIZE) {
+	if (readn_nointr(fd, filebuf, KS_COUNTER_SIZE) != KS_COUNTER_SIZE) {
 		goto cleanup;
 	}
 
-	if (looping_write(tmp_ks_fd, filebuf, KS_COUNTER_SIZE)
+	if (writen_nointr(tmp_ks_fd, filebuf, KS_COUNTER_SIZE)
 	    != KS_COUNTER_SIZE) {
 		goto cleanup;
 	}
@@ -1566,7 +1520,7 @@ soft_keystore_setpin(uchar_t *oldpin, uchar_t *newpin, boolean_t lock_held)
 	if (crypt_salt == NULL) {
 		goto cleanup;
 	}
-	if (looping_read(fd, (char *)crypt_salt, KS_KEY_SALT_SIZE)
+	if (readn_nointr(fd, (char *)crypt_salt, KS_KEY_SALT_SIZE)
 	    != KS_KEY_SALT_SIZE) {
 		goto cleanup;
 	}
@@ -1576,7 +1530,7 @@ soft_keystore_setpin(uchar_t *oldpin, uchar_t *newpin, boolean_t lock_held)
 	if (hmac_salt == NULL) {
 		goto cleanup;
 	}
-	if (looping_read(fd, (char *)hmac_salt, KS_HMAC_SALT_SIZE)
+	if (readn_nointr(fd, (char *)hmac_salt, KS_HMAC_SALT_SIZE)
 	    != KS_HMAC_SALT_SIZE) {
 		goto cleanup;
 	}
@@ -1593,7 +1547,7 @@ soft_keystore_setpin(uchar_t *oldpin, uchar_t *newpin, boolean_t lock_held)
 		    != CKR_OK) {
 			goto cleanup;
 		}
-		if (looping_write(tmp_ks_fd, (void *)new_crypt_salt,
+		if (writen_nointr(tmp_ks_fd, (void *)new_crypt_salt,
 		    KS_KEY_SALT_SIZE) != KS_KEY_SALT_SIZE) {
 			free(new_crypt_salt);
 			(void) soft_cleanup_object(new_crypt_key);
@@ -1606,7 +1560,7 @@ soft_keystore_setpin(uchar_t *oldpin, uchar_t *newpin, boolean_t lock_held)
 			(void) soft_cleanup_object(new_crypt_key);
 			goto cleanup;
 		}
-		if (looping_write(tmp_ks_fd, (void *)new_hmac_salt,
+		if (writen_nointr(tmp_ks_fd, (void *)new_hmac_salt,
 		    KS_HMAC_SALT_SIZE) != KS_HMAC_SALT_SIZE) {
 			free(new_hmac_salt);
 			goto cleanup3;
@@ -1618,7 +1572,7 @@ soft_keystore_setpin(uchar_t *oldpin, uchar_t *newpin, boolean_t lock_held)
 			goto cleanup;
 		}
 		/* no change to the encryption salt */
-		if (looping_write(tmp_ks_fd, (void *)crypt_salt,
+		if (writen_nointr(tmp_ks_fd, (void *)crypt_salt,
 		    KS_KEY_SALT_SIZE) != KS_KEY_SALT_SIZE) {
 			(void) soft_cleanup_object(new_crypt_key);
 			goto cleanup;
@@ -1631,7 +1585,7 @@ soft_keystore_setpin(uchar_t *oldpin, uchar_t *newpin, boolean_t lock_held)
 		}
 
 		/* no change to the hmac salt */
-		if (looping_write(tmp_ks_fd, (void *)hmac_salt,
+		if (writen_nointr(tmp_ks_fd, (void *)hmac_salt,
 		    KS_HMAC_SALT_SIZE) != KS_HMAC_SALT_SIZE) {
 			goto cleanup3;
 		}
@@ -1641,12 +1595,12 @@ soft_keystore_setpin(uchar_t *oldpin, uchar_t *newpin, boolean_t lock_held)
 	 * read hashed pin salt, and write to updated keystore description
 	 * file unmodified.
 	 */
-	if (looping_read(fd, (char *)&hashed_pin_salt_length,
+	if (readn_nointr(fd, (char *)&hashed_pin_salt_length,
 	    KS_HASHED_PIN_SALT_LEN_SIZE) != KS_HASHED_PIN_SALT_LEN_SIZE) {
 		goto cleanup3;
 	}
 
-	if (looping_write(tmp_ks_fd, (void *)&hashed_pin_salt_length,
+	if (writen_nointr(tmp_ks_fd, (void *)&hashed_pin_salt_length,
 	    KS_HASHED_PIN_SALT_LEN_SIZE) != KS_HASHED_PIN_SALT_LEN_SIZE) {
 		goto cleanup3;
 	}
@@ -1658,13 +1612,13 @@ soft_keystore_setpin(uchar_t *oldpin, uchar_t *newpin, boolean_t lock_held)
 		goto cleanup3;
 	}
 
-	if ((looping_read(fd, hashed_pin_salt, hashed_pin_salt_length)) !=
+	if ((readn_nointr(fd, hashed_pin_salt, hashed_pin_salt_length)) !=
 	    (ssize_t)hashed_pin_salt_length) {
 		free(hashed_pin_salt);
 		goto cleanup3;
 	}
 
-	if ((looping_write(tmp_ks_fd, hashed_pin_salt, hashed_pin_salt_length))
+	if ((writen_nointr(tmp_ks_fd, hashed_pin_salt, hashed_pin_salt_length))
 	    != (ssize_t)hashed_pin_salt_length) {
 		free(hashed_pin_salt);
 		goto cleanup3;
@@ -1689,12 +1643,12 @@ soft_keystore_setpin(uchar_t *oldpin, uchar_t *newpin, boolean_t lock_held)
 
 	/* write new hashed pin length to file */
 	swaped_val = SWAP64(new_hashed_pin_len);
-	if (looping_write(tmp_ks_fd, (void *)&swaped_val,
+	if (writen_nointr(tmp_ks_fd, (void *)&swaped_val,
 	    KS_HASHED_PINLEN_SIZE) != KS_HASHED_PINLEN_SIZE) {
 		goto cleanup3;
 	}
 
-	if (looping_write(tmp_ks_fd, (void *)new_hashed_pin,
+	if (writen_nointr(tmp_ks_fd, (void *)new_hashed_pin,
 	    new_hashed_pin_len) != (ssize_t)new_hashed_pin_len) {
 		goto cleanup3;
 	}
@@ -1868,7 +1822,7 @@ soft_keystore_authpin(uchar_t  *pin)
 		goto cleanup;
 	}
 
-	if (looping_read(fd, (char *)crypt_salt, KS_KEY_SALT_SIZE)
+	if (readn_nointr(fd, (char *)crypt_salt, KS_KEY_SALT_SIZE)
 	    != KS_KEY_SALT_SIZE) {
 		goto cleanup;
 	}
@@ -1887,7 +1841,7 @@ soft_keystore_authpin(uchar_t  *pin)
 		goto cleanup;
 	}
 
-	if (looping_read(fd, (char *)hmac_salt, KS_HMAC_SALT_SIZE)
+	if (readn_nointr(fd, (char *)hmac_salt, KS_HMAC_SALT_SIZE)
 	    != KS_HMAC_SALT_SIZE) {
 		goto cleanup;
 	}
@@ -2101,19 +2055,19 @@ soft_keystore_get_single_obj(ks_obj_handle_t *ks_handle,
 	(obj->ks_handle).public = ks_handle->public;
 
 	/* 1st get the version */
-	if (looping_read(fd, &(obj->obj_version), OBJ_VER_SIZE)
+	if (readn_nointr(fd, &(obj->obj_version), OBJ_VER_SIZE)
 	    != OBJ_VER_SIZE) {
 		goto cleanup;
 	}
 	obj->obj_version = SWAP32(obj->obj_version);
 
 	/* Then, read the IV */
-	if (looping_read(fd, iv, OBJ_IV_SIZE) != OBJ_IV_SIZE) {
+	if (readn_nointr(fd, iv, OBJ_IV_SIZE) != OBJ_IV_SIZE) {
 		goto cleanup;
 	}
 
 	/* Then, read the HMAC */
-	if (looping_read(fd, obj_hmac, OBJ_HMAC_SIZE) != OBJ_HMAC_SIZE) {
+	if (readn_nointr(fd, obj_hmac, OBJ_HMAC_SIZE) != OBJ_HMAC_SIZE) {
 		goto cleanup;
 	}
 
@@ -2277,31 +2231,26 @@ soft_keystore_put_new_obj(uchar_t *buf, size_t len, boolean_t public,
 	 * create a tempoary file for the keystore description
 	 * file for updating version and counter information
 	 */
-	while ((tmp_ks_fd = open(tmp_ks_desc_name,
-	    O_RDWR|O_CREAT|O_EXCL|O_NONBLOCK, S_IRUSR|S_IWUSR)) < 0) {
-		if (errno != EINTR)
-			break;
-	}
+	tmp_ks_fd = open_nointr(tmp_ks_desc_name,
+	    O_RDWR|O_CREAT|O_EXCL|O_NONBLOCK, S_IRUSR|S_IWUSR);
 	if (tmp_ks_fd < 0) {
 		(void) close(fd);
 		return (-1);
 	}
 
-	(void) fcntl(tmp_ks_fd, F_SETFD, FD_CLOEXEC);
-
 	/* read and write pkcs11 version */
-	if (looping_read(fd, filebuf, KS_PKCS11_VER_SIZE)
+	if (readn_nointr(fd, filebuf, KS_PKCS11_VER_SIZE)
 	    != KS_PKCS11_VER_SIZE) {
 		goto cleanup;
 	}
 
-	if (looping_write(tmp_ks_fd, filebuf, KS_PKCS11_VER_SIZE)
+	if (writen_nointr(tmp_ks_fd, filebuf, KS_PKCS11_VER_SIZE)
 	    != KS_PKCS11_VER_SIZE) {
 		goto cleanup;
 	}
 
 	/* get version number, and write updated number to temp file */
-	if (looping_read(fd, &version, KS_VER_SIZE) != KS_VER_SIZE) {
+	if (readn_nointr(fd, &version, KS_VER_SIZE) != KS_VER_SIZE) {
 		goto cleanup;
 	}
 
@@ -2309,13 +2258,13 @@ soft_keystore_put_new_obj(uchar_t *buf, size_t len, boolean_t public,
 	version++;
 	version = SWAP32(version);
 
-	if (looping_write(tmp_ks_fd, (void *)&version,
+	if (writen_nointr(tmp_ks_fd, (void *)&version,
 	    KS_VER_SIZE) != KS_VER_SIZE) {
 		goto cleanup;
 	}
 
 	/* get object count value */
-	if (looping_read(fd, &counter, KS_COUNTER_SIZE) != KS_COUNTER_SIZE) {
+	if (readn_nointr(fd, &counter, KS_COUNTER_SIZE) != KS_COUNTER_SIZE) {
 		goto cleanup;
 	}
 	counter = SWAP32(counter);
@@ -2330,19 +2279,13 @@ soft_keystore_put_new_obj(uchar_t *buf, size_t len, boolean_t public,
 	}
 
 	/* create object file */
-	while ((obj_fd = open(obj_name,
-	    O_WRONLY|O_CREAT|O_EXCL|O_NONBLOCK, S_IRUSR|S_IWUSR)) < 0) {
-		if (errno != EINTR)
-			break;
-	}
+	obj_fd = open_nointr(obj_name,
+	    O_WRONLY|O_CREAT|O_EXCL|O_NONBLOCK, S_IRUSR|S_IWUSR);
 	if (obj_fd < 0) {
 		/* can't create object file */
 		goto cleanup;
 	}
 
-	/* mark obj_fd "close on exec" */
-	(void) fcntl(obj_fd, F_SETFD, FD_CLOEXEC);
-
 	/* lock object file for writing */
 	if (lock_file(obj_fd, B_FALSE, B_TRUE) != 0) {
 		(void) close(obj_fd);
@@ -2351,7 +2294,7 @@ soft_keystore_put_new_obj(uchar_t *buf, size_t len, boolean_t public,
 
 	/* write object meta data */
 	version = SWAP32(1);
-	if (looping_write(obj_fd, (void *)&version, sizeof (version))
+	if (writen_nointr(obj_fd, (void *)&version, sizeof (version))
 	    != sizeof (version)) {
 		goto cleanup2;
 	}
@@ -2366,19 +2309,19 @@ soft_keystore_put_new_obj(uchar_t *buf, size_t len, boolean_t public,
 
 	}
 
-	if (looping_write(obj_fd, (void *)iv, sizeof (iv)) != sizeof (iv)) {
+	if (writen_nointr(obj_fd, (void *)iv, sizeof (iv)) != sizeof (iv)) {
 		goto cleanup2;
 	}
 
 	if (public) {
 
 		bzero(obj_hmac, sizeof (obj_hmac));
-		if (looping_write(obj_fd, (void *)obj_hmac,
+		if (writen_nointr(obj_fd, (void *)obj_hmac,
 		    sizeof (obj_hmac)) != sizeof (obj_hmac)) {
 			goto cleanup2;
 		}
 
-		if (looping_write(obj_fd, (char *)buf, len) != len) {
+		if (writen_nointr(obj_fd, (char *)buf, len) != len) {
 			goto cleanup2;
 		}
 
@@ -2428,14 +2371,14 @@ soft_keystore_put_new_obj(uchar_t *buf, size_t len, boolean_t public,
 		}
 
 		/* write hmac */
-		if (looping_write(obj_fd, (void *)obj_hmac,
+		if (writen_nointr(obj_fd, (void *)obj_hmac,
 		    sizeof (obj_hmac)) != sizeof (obj_hmac)) {
 			free(encrypted_buf);
 			goto cleanup2;
 		}
 
 		/* write encrypted object */
-		if (looping_write(obj_fd, (void *)encrypted_buf, out_len)
+		if (writen_nointr(obj_fd, (void *)encrypted_buf, out_len)
 		    != out_len) {
 			free(encrypted_buf);
 			goto cleanup2;
@@ -2455,18 +2398,18 @@ soft_keystore_put_new_obj(uchar_t *buf, size_t len, boolean_t public,
 	 */
 	counter++;
 	counter = SWAP32(counter);
-	if (looping_write(tmp_ks_fd, (void *)&counter,
+	if (writen_nointr(tmp_ks_fd, (void *)&counter,
 	    sizeof (counter)) != sizeof (counter)) {
 		goto cleanup2;
 	}
 
 	/* read rest of keystore description file and store into temp file */
-	nread = looping_read(fd, filebuf, sizeof (filebuf));
+	nread = readn_nointr(fd, filebuf, sizeof (filebuf));
 	while (nread > 0) {
-		if (looping_write(tmp_ks_fd, filebuf, nread) != nread) {
+		if (writen_nointr(tmp_ks_fd, filebuf, nread) != nread) {
 			goto cleanup2;
 		}
-		nread = looping_read(fd, filebuf, sizeof (filebuf));
+		nread = readn_nointr(fd, filebuf, sizeof (filebuf));
 	}
 
 	(void) close(tmp_ks_fd);
@@ -2587,19 +2530,15 @@ soft_keystore_modify_obj(ks_obj_handle_t *ks_handle, uchar_t *buf,
 		    (ks_handle->name) + strlen(OBJ_PREFIX));
 	}
 
-	while ((tmp_fd = open(tmp_name,
-	    O_WRONLY|O_CREAT|O_EXCL|O_NONBLOCK, S_IRUSR|S_IWUSR)) < 0) {
-		if (errno != EINTR)
-			break;
-	}
+	tmp_fd = open_nointr(tmp_name,
+	    O_WRONLY|O_CREAT|O_EXCL|O_NONBLOCK, S_IRUSR|S_IWUSR);
 	if (tmp_fd < 0) {
 		/* can't create tmp object file */
 		goto cleanup1;
 	}
-	(void) fcntl(tmp_fd, F_SETFD, FD_CLOEXEC);
 
 	/* read version, increment, and write to tmp file */
-	if (looping_read(fd, (char *)&version, OBJ_VER_SIZE) != OBJ_VER_SIZE) {
+	if (readn_nointr(fd, (char *)&version, OBJ_VER_SIZE) != OBJ_VER_SIZE) {
 		goto cleanup2;
 	}
 
@@ -2607,7 +2546,7 @@ soft_keystore_modify_obj(ks_obj_handle_t *ks_handle, uchar_t *buf,
 	version++;
 	version = SWAP32(version);
 
-	if (looping_write(tmp_fd, (char *)&version, OBJ_VER_SIZE)
+	if (writen_nointr(tmp_fd, (char *)&version, OBJ_VER_SIZE)
 	    != OBJ_VER_SIZE) {
 		goto cleanup2;
 	}
@@ -2617,7 +2556,7 @@ soft_keystore_modify_obj(ks_obj_handle_t *ks_handle, uchar_t *buf,
 		goto cleanup2;
 	}
 
-	if (looping_write(tmp_fd, (char *)iv, OBJ_IV_SIZE) != OBJ_IV_SIZE) {
+	if (writen_nointr(tmp_fd, (char *)iv, OBJ_IV_SIZE) != OBJ_IV_SIZE) {
 		goto cleanup2;
 	}
 
@@ -2625,13 +2564,13 @@ soft_keystore_modify_obj(ks_obj_handle_t *ks_handle, uchar_t *buf,
 
 		/* hmac is always NULL for public objects */
 		bzero(obj_hmac, sizeof (obj_hmac));
-		if (looping_write(tmp_fd, (char *)obj_hmac, OBJ_HMAC_SIZE)
+		if (writen_nointr(tmp_fd, (char *)obj_hmac, OBJ_HMAC_SIZE)
 		    != OBJ_HMAC_SIZE) {
 			goto cleanup2;
 		}
 
 		/* write updated object */
-		if (looping_write(tmp_fd, (char *)buf, len) != len) {
+		if (writen_nointr(tmp_fd, (char *)buf, len) != len) {
 			goto cleanup2;
 		}
 
@@ -2680,13 +2619,13 @@ soft_keystore_modify_obj(ks_obj_handle_t *ks_handle, uchar_t *buf,
 			goto cleanup2;
 		}
 
-		if (looping_write(tmp_fd, (char *)obj_hmac, OBJ_HMAC_SIZE)
+		if (writen_nointr(tmp_fd, (char *)obj_hmac, OBJ_HMAC_SIZE)
 		    != OBJ_HMAC_SIZE) {
 			free(encrypted_buf);
 			goto cleanup2;
 		}
 
-		if (looping_write(tmp_fd, (void *)encrypted_buf, out_len)
+		if (writen_nointr(tmp_fd, (void *)encrypted_buf, out_len)
 		    != out_len) {
 			free(encrypted_buf);
 			goto cleanup2;
@@ -2853,7 +2792,7 @@ soft_keystore_get_pin_salt(char **salt)
 		goto cleanup;
 	}
 
-	if (looping_read(fd, (char *)&hashed_pin_salt_size,
+	if (readn_nointr(fd, (char *)&hashed_pin_salt_size,
 	    KS_HASHED_PIN_SALT_LEN_SIZE) != KS_HASHED_PIN_SALT_LEN_SIZE) {
 		goto cleanup;
 	}
@@ -2864,7 +2803,7 @@ soft_keystore_get_pin_salt(char **salt)
 		goto cleanup;
 	}
 
-	if ((looping_read(fd, *salt, hashed_pin_salt_size))
+	if ((readn_nointr(fd, *salt, hashed_pin_salt_size))
 	    != (ssize_t)hashed_pin_salt_size) {
 		free(*salt);
 		goto cleanup;
@@ -2927,7 +2866,7 @@ soft_keystore_pin_initialized(boolean_t *initialized, char **hashed_pin,
 		goto cleanup;
 	}
 
-	if (looping_read(fd, (char *)crypt_salt, KS_KEY_SALT_SIZE)
+	if (readn_nointr(fd, (char *)crypt_salt, KS_KEY_SALT_SIZE)
 	    != KS_KEY_SALT_SIZE) {
 		ret_val = CKR_FUNCTION_FAILED;
 		goto cleanup;
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softRand.c b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softRand.c
index 8b74d88048..0ef1586274 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softRand.c
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softRand.c
@@ -19,17 +19,16 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <security/cryptoki.h>
+#include <cryptoutil.h>
 #include "softGlobal.h"
 #include "softRandom.h"
 #include "softSession.h"
@@ -59,28 +58,21 @@ C_SeedRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed, CK_ULONG ulSeedLen)
 
 	if (soft_urandom_seed_fd < 0) {
 		(void) pthread_mutex_lock(&soft_giant_mutex);
-			/* Check again holding the mutex */
+		/* Check again holding the mutex */
+		if (soft_urandom_seed_fd < 0) {
+			soft_urandom_seed_fd = open_nointr(DEV_URANDOM,
+			    O_WRONLY);
 			if (soft_urandom_seed_fd < 0) {
-				while ((soft_urandom_seed_fd = open(DEV_URANDOM,
-				    O_WRONLY)) < 0) {
-					if (errno != EINTR)
-						break;
-				}
-				if (soft_urandom_seed_fd < 0) {
-					(void) pthread_mutex_unlock(
-					    &soft_giant_mutex);
-					if (errno == EACCES)
-						return (
-						CKR_RANDOM_SEED_NOT_SUPPORTED);
-					return (CKR_DEVICE_ERROR);
-				}
-				(void) fcntl(soft_urandom_seed_fd, F_SETFD,
-				    FD_CLOEXEC);
+				(void) pthread_mutex_unlock(&soft_giant_mutex);
+				if (errno == EACCES)
+					return (CKR_RANDOM_SEED_NOT_SUPPORTED);
+				return (CKR_DEVICE_ERROR);
 			}
+		}
 		(void) pthread_mutex_unlock(&soft_giant_mutex);
 	}
 
-	nwrite = looping_write(soft_urandom_seed_fd, pSeed, ulSeedLen);
+	nwrite = writen_nointr(soft_urandom_seed_fd, pSeed, ulSeedLen);
 	if (nwrite <= 0) {
 		return (CKR_DEVICE_ERROR);
 	}
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softRandUtil.c b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softRandUtil.c
index 1923abac96..bf2c843ba5 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/common/softRandUtil.c
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/common/softRandUtil.c
@@ -19,12 +19,10 @@
  * CDDL HEADER END
  */
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <fcntl.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -36,6 +34,7 @@
 #include <sys/types.h>
 #include <security/cryptoki.h>
 #include <bignum.h>
+#include <cryptoutil.h>
 #include "softGlobal.h"
 #include "softRandom.h"
 #include "softCrypt.h"
@@ -56,18 +55,13 @@ soft_random_generator(CK_BYTE *ran_out, CK_ULONG ran_len, boolean_t token)
 			(void) pthread_mutex_lock(&soft_giant_mutex);
 			/* Check again holding the mutex */
 			if (soft_random_fd < 0) {
-				while ((soft_random_fd = open(DEV_RANDOM,
-				    O_RDONLY)) < 0) {
-					if (errno != EINTR)
-						break;
-				}
+				soft_random_fd = open_nointr(DEV_RANDOM,
+				    O_RDONLY);
 				if (soft_random_fd < 0) {
 					(void) pthread_mutex_unlock(
 					    &soft_giant_mutex);
 					return (CKR_DEVICE_ERROR);
 				}
-				(void) fcntl(soft_random_fd, F_SETFD,
-				    FD_CLOEXEC);
 			}
 			(void) pthread_mutex_unlock(&soft_giant_mutex);
 		}
@@ -76,27 +70,22 @@ soft_random_generator(CK_BYTE *ran_out, CK_ULONG ran_len, boolean_t token)
 			(void) pthread_mutex_lock(&soft_giant_mutex);
 			/* Check again holding the mutex */
 			if (soft_urandom_fd < 0) {
-				while ((soft_urandom_fd = open(DEV_URANDOM,
-				    O_RDONLY)) < 0) {
-					if (errno != EINTR)
-						break;
-				}
+				soft_urandom_fd = open_nointr(DEV_URANDOM,
+				    O_RDONLY);
 				if (soft_urandom_fd < 0) {
 					(void) pthread_mutex_unlock(
 					    &soft_giant_mutex);
 					return (CKR_DEVICE_ERROR);
 				}
-				(void) fcntl(soft_urandom_fd, F_SETFD,
-				    FD_CLOEXEC);
 			}
 			(void) pthread_mutex_unlock(&soft_giant_mutex);
 		}
 	}
 
 	if (token)
-		nread = looping_read(soft_random_fd, ran_out, ran_len);
+		nread = readn_nointr(soft_random_fd, ran_out, ran_len);
 	else
-		nread = looping_read(soft_urandom_fd, ran_out, ran_len);
+		nread = readn_nointr(soft_urandom_fd, ran_out, ran_len);
 
 	if (nread <= 0) {
 		return (CKR_DEVICE_ERROR);