diff --git a/src/libopensc/card-piv.c b/src/libopensc/card-piv.c index ce5a5de8..b89d02aa 100644 --- a/src/libopensc/card-piv.c +++ b/src/libopensc/card-piv.c @@ -1391,7 +1391,6 @@ static const EVP_CIPHER *get_cipher_for_algo(int alg_id) default: return NULL; } } -#endif static int get_keylen(unsigned int alg_id, size_t *size) { @@ -1516,6 +1515,7 @@ err: SC_FUNC_RETURN(card->ctx, SC_LOG_DEBUG_NORMAL, r); return r; } +#endif /* * will only deal with 3des for now diff --git a/src/libopensc/card-westcos.c b/src/libopensc/card-westcos.c index 76788bcf..0dce9653 100644 --- a/src/libopensc/card-westcos.c +++ b/src/libopensc/card-westcos.c @@ -1097,12 +1097,12 @@ static int westcos_sign_decipher(int mode, sc_card_t *card, size_t outlen) { int r; + sc_file_t *keyfile = sc_file_new(); +#ifdef ENABLE_OPENSSL int idx = 0; u8 buf[180]; - sc_file_t *keyfile = sc_file_new(); priv_data_t *priv_data = NULL; int pad; -#ifdef ENABLE_OPENSSL RSA *rsa = NULL; BIO *mem = BIO_new(BIO_s_mem()); #endif @@ -1234,8 +1234,8 @@ out: BIO_free(mem); if (rsa) RSA_free(rsa); -#endif /* ENABLE_OPENSSL */ out2: +#endif /* ENABLE_OPENSSL */ if (keyfile) sc_file_free(keyfile); return r; diff --git a/src/libopensc/pkcs15-itacns.c b/src/libopensc/pkcs15-itacns.c index 55e9f31b..02107cdf 100644 --- a/src/libopensc/pkcs15-itacns.c +++ b/src/libopensc/pkcs15-itacns.c @@ -199,8 +199,8 @@ static int itacns_add_cert(sc_pkcs15_card_t *p15card, sc_pkcs15_object_t obj; #ifdef ENABLE_OPENSSL X509 *x509; -#endif sc_pkcs15_cert_t *cert; +#endif SC_FUNC_CALLED(p15card->card->ctx, 1);