From 8b5f99861f73229af08bb6893d99d797688f96af Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 4 Sep 2009 03:58:57 +0000
Subject: [PATCH] use HAVE_GETPASS

---
 contrib/pkcs11-keygen/destroyobj.c | 2 +-
 contrib/pkcs11-keygen/readkey.c    | 2 +-
 contrib/pkcs11-keygen/set_key_id.c | 2 +-
 contrib/pkcs11-keygen/writekey.c   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/pkcs11-keygen/destroyobj.c b/contrib/pkcs11-keygen/destroyobj.c
index 9c714d8e90..0883978403 100644
--- a/contrib/pkcs11-keygen/destroyobj.c
+++ b/contrib/pkcs11-keygen/destroyobj.c
@@ -93,7 +93,7 @@ main(int argc, char *argv[])
 
     /* Login to the Token (Keystore) */
     if (!pin)
-#ifndef OPENCRYPTOKI
+#ifndef HAVE_GETPASS
 	pin = (CK_UTF8CHAR *)getpassphrase("Enter Pin: ");
 #else
 	pin = (CK_UTF8CHAR *)getpass("Enter Pin: ");
diff --git a/contrib/pkcs11-keygen/readkey.c b/contrib/pkcs11-keygen/readkey.c
index 869717c732..551e90fdf8 100644
--- a/contrib/pkcs11-keygen/readkey.c
+++ b/contrib/pkcs11-keygen/readkey.c
@@ -117,7 +117,7 @@ main(int argc, char *argv[])
 
     /* Login to the Token (Keystore) */
     if (!pin)
-#ifndef OPENCRYPTOKI
+#ifndef HAVE_GETPASS
         pin = (CK_UTF8CHAR *)getpassphrase("Enter Pin: ");
 #else
         pin = (CK_UTF8CHAR *)getpass("Enter Pin: ");
diff --git a/contrib/pkcs11-keygen/set_key_id.c b/contrib/pkcs11-keygen/set_key_id.c
index 5c3a3c409c..f2d8bcb8cf 100644
--- a/contrib/pkcs11-keygen/set_key_id.c
+++ b/contrib/pkcs11-keygen/set_key_id.c
@@ -101,7 +101,7 @@ main(int argc, char *argv[])
 
     /* Login to the Token (Keystore) */
     if (!pin)
-#ifndef OPENCRYPTOKI
+#ifndef HAVE_GETPASS
         pin = (CK_UTF8CHAR *)getpassphrase("Enter Pin: ");
 #else
         pin = (CK_UTF8CHAR *)getpass("Enter Pin: ");
diff --git a/contrib/pkcs11-keygen/writekey.c b/contrib/pkcs11-keygen/writekey.c
index 3d1ba99d71..d0aacb2702 100644
--- a/contrib/pkcs11-keygen/writekey.c
+++ b/contrib/pkcs11-keygen/writekey.c
@@ -139,7 +139,7 @@ main(int argc, char *argv[])
 
     /* Login to the Token (Keystore) */
     if (!pin)
-#ifndef OPENCRYPTOKI
+#ifndef HAVE_GETPASS
         pin = (CK_UTF8CHAR *)getpassphrase("Enter Pin: ");
 #else
         pin = (CK_UTF8CHAR *)getpass("Enter Pin: ");