summaryrefslogtreecommitdiff
path: root/ssh-pkcs11.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-01-20 23:11:11 +0000
committerDamien Miller <djm@mindrot.org>2019-01-21 10:57:03 +1100
commit6529409e85890cd6df7e5e81d04e393b1d2e4b0b (patch)
tree3804a46dbf00c54ac0dac047b1f4f96b83c50c79 /ssh-pkcs11.c
parent58622a8c82f4e2aad630580543f51ba537c1f39e (diff)
upstream: KNF previous; from markus@
OpenBSD-Commit-ID: 3dfe35e25b310c3968b1e4e53a0cb1d03bda5395
Diffstat (limited to 'ssh-pkcs11.c')
-rw-r--r--ssh-pkcs11.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index b8f2a3a4e..1a6e9806e 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-pkcs11.c,v 1.34 2019/01/20 23:10:33 djm Exp $ */ 1/* $OpenBSD: ssh-pkcs11.c,v 1.35 2019/01/20 23:11:11 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2010 Markus Friedl. All rights reserved. 3 * Copyright (c) 2010 Markus Friedl. All rights reserved.
4 * Copyright (c) 2014 Pedro Martelletto. All rights reserved. 4 * Copyright (c) 2014 Pedro Martelletto. All rights reserved.
@@ -84,11 +84,11 @@ int pkcs11_interactive = 0;
84static void 84static void
85ossl_error(const char *msg) 85ossl_error(const char *msg)
86{ 86{
87 unsigned long e; 87 unsigned long e;
88 88
89 while ((e = ERR_get_error()) != 0) 89 while ((e = ERR_get_error()) != 0)
90 error("%s: %s: %.100s", __func__, msg, 90 error("%s: %s: %.100s", __func__, msg,
91 ERR_error_string(e, NULL)); 91 ERR_error_string(e, NULL));
92} 92}
93#endif 93#endif
94 94
@@ -1251,7 +1251,7 @@ static struct ec_curve_info {
1251 {"prime256v1", "1.2.840.10045.3.1.7", "06082A8648CE3D030107", 256}, 1251 {"prime256v1", "1.2.840.10045.3.1.7", "06082A8648CE3D030107", 256},
1252 {"secp384r1", "1.3.132.0.34", "06052B81040022", 384}, 1252 {"secp384r1", "1.3.132.0.34", "06052B81040022", 384},
1253 {"secp521r1", "1.3.132.0.35", "06052B81040023", 521}, 1253 {"secp521r1", "1.3.132.0.35", "06052B81040023", 521},
1254 {NULL, NULL, NULL, 0}, 1254 {NULL, NULL, NULL, 0},
1255}; 1255};
1256 1256
1257static struct sshkey * 1257static struct sshkey *