===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-pkcs11.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- src/usr.bin/ssh/ssh-pkcs11.c	2019/01/20 23:11:11	1.35
+++ src/usr.bin/ssh/ssh-pkcs11.c	2019/01/20 23:12:35	1.36
@@ -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 @@
 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 @@
 		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 @@
 	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);