From de60c98462f78082edd53f47ba499db97627358b Mon Sep 17 00:00:00 2001 From: sth Date: Tue, 5 Jul 2005 13:34:03 +0000 Subject: [PATCH] Macro cleanup, patch received some time ago but appearently not committed git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@2377 c6295689-39f2-0310-b995-f0e70906c6a9 --- src/sslengines/p11_rsa.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/sslengines/p11_rsa.c b/src/sslengines/p11_rsa.c index a1a419f5..131d6037 100644 --- a/src/sslengines/p11_rsa.c +++ b/src/sslengines/p11_rsa.c @@ -69,10 +69,11 @@ static int pkcs11_get_rsa_public(PKCS11_KEY *, EVP_PKEY *); static int pkcs11_get_rsa_private(PKCS11_KEY *, EVP_PKEY *); RSA_METHOD *pkcs11_get_rsa_method(void); -#define key_getattr(k, t, p, s) \ - pkcs11_getattr(KEY2TOKEN(key), PRIVKEY(key)->object, t, p, s) -#define key_getattr_bn(k, t, bn) \ - pkcs11_getattr_bn(KEY2TOKEN(key), PRIVKEY(key)->object, t, bn) +#define key_getattr(key, t, p, s) \ + pkcs11_getattr(KEY2TOKEN((key)), PRIVKEY((key))->object, (t), (p), (s)) + +#define key_getattr_bn(key, t, bn) \ + pkcs11_getattr_bn(KEY2TOKEN((key)), PRIVKEY((key))->object, (t), (bn)) /* * Get RSA key material