summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Andersson <hean01@cendio.com>2017-10-17 10:32:40 +0200
committerHenrik Andersson <hean01@cendio.com>2017-10-17 10:32:40 +0200
commit267db2ceffc75989559608f92e632a93b7dc1f0f (patch)
treea9099dbf2556957aa44b3244275dff23dab42c15
parent02a7ec43611f09449fd9e0b42f7ea9e6afb22af4 (diff)
downloadrdesktop-267db2ceffc75989559608f92e632a93b7dc1f0f.zip
Fix compile warnings about unused variables
-rw-r--r--scard.c4
-rw-r--r--ssl.c5
2 files changed, 3 insertions, 6 deletions
diff --git a/scard.c b/scard.c
index b820112..40dd8fd 100644
--- a/scard.c
+++ b/scard.c
@@ -1772,8 +1772,6 @@ TS_SCardStatus(STREAM in, STREAM out, RD_BOOL wide)
}
else
{
- int i;
-
logger(SmartCard, Debug, "TS_SCardTransmit(), success, state=0x%08x, proto=0x%08x",
(unsigned) dwState, (unsigned) dwProtocol);
@@ -1879,8 +1877,6 @@ TS_SCardState(STREAM in, STREAM out)
}
else
{
- int i;
-
logger(SmartCard, Debug, "TS_SCardState(), success, state=0x%08x, proto=0x%08x",
(unsigned) dwState, (unsigned) dwProtocol);
diff --git a/ssl.c b/ssl.c
index 065e404..eb2066f 100644
--- a/ssl.c
+++ b/ssl.c
@@ -161,10 +161,11 @@ rdssl_cert_to_rkey(RDSSL_CERT * cert, uint32 * key_len)
int nid;
int ret;
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
const unsigned char *p;
- int pklen;
-
RSA *rsa = NULL;
+ int pklen;
+#endif
/* By some reason, Microsoft sets the OID of the Public RSA key to
the oid for "MD5 with RSA Encryption" instead of "RSA Encryption"