diff options
| author |   djm <djm@openbsd.org> | 2019-01-20 23:12:35 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-01-20 23:12:35 +0000 |
| commit | c167eeaa861de1480af432eeb4c9f0e379faec18 (patch) | |
| tree | 21f25b8934cad81be47aa09173f24774e2c48409 | |
| parent | KNF previous; from markus@ (diff) | |
| download | wireguard-openbsd-c167eeaa861de1480af432eeb4c9f0e379faec18.tar.xz wireguard-openbsd-c167eeaa861de1480af432eeb4c9f0e379faec18.zip | |
we use singleton pkcs#11 RSA_METHOD and EC_KEY_METHOD now, so there
is no need to keep a copy of each in the pkcs11_key object.
work by markus@, ok djm@
| -rw-r--r-- | usr.bin/ssh/ssh-pkcs11.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.bin/ssh/ssh-pkcs11.c b/usr.bin/ssh/ssh-pkcs11.c index 90b94a7e6f1..bfcce0d09e3 100644 --- a/usr.bin/ssh/ssh-pkcs11.c +++ b/usr.bin/ssh/ssh-pkcs11.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-pkcs11.c,v 1.35 2019/01/20 23:11:11 djm Exp $ */ +/* $OpenBSD: ssh-pkcs11.c,v 1.36 2019/01/20 23:12:35 djm Exp $ */ /* * Copyright (c) 2010 Markus Friedl. All rights reserved. * Copyright (c) 2014 Pedro Martelletto. All rights reserved. @@ -62,8 +62,6 @@ TAILQ_HEAD(, pkcs11_provider) pkcs11_providers; struct pkcs11_key { struct pkcs11_provider *provider; CK_ULONG slotidx; - RSA_METHOD *rsa_method; - EC_KEY_METHOD *ec_key_method; char *keyid; int keyid_len; }; @@ -399,8 +397,7 @@ pkcs11_rsa_wrap(struct pkcs11_provider *provider, CK_ULONG slotidx, memcpy(k11->keyid, keyid_attrib->pValue, k11->keyid_len); } - k11->rsa_method = rsa_method; - RSA_set_method(rsa, k11->rsa_method); + RSA_set_method(rsa, rsa_method); RSA_set_ex_data(rsa, rsa_idx, k11); return (0); } @@ -502,9 +499,8 @@ pkcs11_ecdsa_wrap(struct pkcs11_provider *provider, CK_ULONG slotidx, k11->keyid_len = keyid_attrib->ulValueLen; k11->keyid = xmalloc(k11->keyid_len); memcpy(k11->keyid, keyid_attrib->pValue, k11->keyid_len); - k11->ec_key_method = ec_key_method; - EC_KEY_set_method(ec, k11->ec_key_method); + EC_KEY_set_method(ec, ec_key_method); EC_KEY_set_ex_data(ec, ec_key_idx, k11); return (0); |