summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh-pkcs11.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index eb78c12e5..381b2a961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
3 - dtucker@cvs.openbsd.org 2013/11/08 11:15:19 3 - dtucker@cvs.openbsd.org 2013/11/08 11:15:19
4 [bufaux.c bufbn.c buffer.c sftp-client.c sftp-common.c sftp-glob.c] 4 [bufaux.c bufbn.c buffer.c sftp-client.c sftp-common.c sftp-glob.c]
5 [uidswap.c] Include stdlib.h for free() as per the man page. 5 [uidswap.c] Include stdlib.h for free() as per the man page.
6 - markus@cvs.openbsd.org 2013/11/13 13:48:20
7 [ssh-pkcs11.c]
8 add missing braces found by pedro
6 9
720131110 1020131110
8 - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by 11 - (dtucker) [regress/keytype.sh] Populate ECDSA key types to be tested by
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index 9941e94ed..c49cbf42b 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-pkcs11.c,v 1.10 2013/11/06 23:05:59 djm Exp $ */ 1/* $OpenBSD: ssh-pkcs11.c,v 1.11 2013/11/13 13:48:20 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2010 Markus Friedl. All rights reserved. 3 * Copyright (c) 2010 Markus Friedl. All rights reserved.
4 * 4 *
@@ -427,7 +427,7 @@ pkcs11_key_included(Key ***keysp, int *nkeys, Key *key)
427 int i; 427 int i;
428 428
429 for (i = 0; i < *nkeys; i++) 429 for (i = 0; i < *nkeys; i++)
430 if (key_equal(key, *keysp[i])) 430 if (key_equal(key, (*keysp)[i]))
431 return (1); 431 return (1);
432 return (0); 432 return (0);
433} 433}