X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/aff51935734441207923b8e59fbc3644fc4e7d2c..26d0709572fdbde4fb94bce6b08d3df4fdb140e5:/scard-opensc.c

diff --git a/scard-opensc.c b/scard-opensc.c
index ff3017f5..dd2c28df 100644
--- a/scard-opensc.c
+++ b/scard-opensc.c
@@ -35,7 +35,7 @@
 #include "key.h"
 #include "log.h"
 #include "xmalloc.h"
-#include "readpass.h"
+#include "misc.h"
 #include "scard.h"
 
 #if OPENSSL_VERSION_NUMBER < 0x00907000L && defined(CRYPTO_LOCK_ENGINE)
@@ -189,7 +189,7 @@ sc_private_decrypt(int flen, u_char *from, u_char *to, RSA *rsa,
 	int r;
 
 	if (padding != RSA_PKCS1_PADDING)
-		return -1;	
+		return -1;
 	r = sc_prkey_op_init(rsa, &key_obj, SC_USAGE_DECRYPT);
 	if (r)
 		return -1;
@@ -325,7 +325,7 @@ static void
 convert_rsa_to_rsa1(Key * in, Key * out)
 {
 	struct sc_priv_data *priv;
-	
+
 	out->rsa->flags = in->rsa->flags;
 	out->flags = in->flags;
 	RSA_set_method(out->rsa, RSA_get_method(in->rsa));
@@ -349,7 +349,7 @@ sc_read_pubkey(Key * k, const struct sc_pkcs15_object *cert_obj)
 	EVP_PKEY *pubkey = NULL;
 	u8 *p;
 	char *tmp;
-	
+
 	debug("sc_read_pubkey() with cert id %02X", cinfo->id.value[0]);
 	r = sc_pkcs15_read_certificate(p15card, cinfo, &cert);
 	if (r) {
@@ -391,7 +391,7 @@ sc_read_pubkey(Key * k, const struct sc_pkcs15_object *cert_obj)
 	tmp = key_fingerprint(k, SSH_FP_MD5, SSH_FP_HEX);
 	debug("fingerprint %d %s", key_size(k), tmp);
 	xfree(tmp);
-	
+
 	return 0;
 err:
 	if (cert)