summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristophe Fergeau <cfergeau@redhat.com>2011-08-12 12:05:22 +0200
committerChristophe Fergeau <cfergeau@redhat.com>2011-09-20 16:08:30 +0200
commit2cf6022100c97ee71df08e84efcc9a743f36544c (patch)
tree006ddde5efdf8f39591b48c81d669ee4db4981aa
parent97ebbc1c0be0464b1139ca8044a511d7516c75fa (diff)
downloadspice-2cf6022100c97ee71df08e84efcc9a743f36544c.tar.gz
spice-2cf6022100c97ee71df08e84efcc9a743f36544c.tar.xz
spice-2cf6022100c97ee71df08e84efcc9a743f36544c.zip
channel: fix EVP_PKEY leak
-rw-r--r--client/red_channel.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/client/red_channel.cpp b/client/red_channel.cpp
index f4cdf529..fafb2e13 100644
--- a/client/red_channel.cpp
+++ b/client/red_channel.cpp
@@ -68,10 +68,7 @@ void RedChannelBase::link(uint32_t connection_id, const std::string& password,
uint32_t link_res;
uint32_t i;
- EVP_PKEY *pubkey;
- int nRSASize;
BIO *bioKey;
- RSA *rsa;
uint8_t *buffer, *p;
uint32_t expected_major;
@@ -168,6 +165,10 @@ void RedChannelBase::link(uint32_t connection_id, const std::string& password,
bioKey = BIO_new(BIO_s_mem());
if (bioKey != NULL) {
+ EVP_PKEY *pubkey;
+ int nRSASize;
+ RSA *rsa;
+
BIO_write(bioKey, reply->pub_key, SPICE_TICKET_PUBKEY_BYTES);
pubkey = d2i_PUBKEY_bio(bioKey, NULL);
rsa = pubkey->pkey.rsa;
@@ -183,10 +184,13 @@ void RedChannelBase::link(uint32_t connection_id, const std::string& password,
rsa, RSA_PKCS1_OAEP_PADDING) > 0) {
send((uint8_t*)bufEncrypted.get(), nRSASize);
} else {
+ EVP_PKEY_free(pubkey);
+ BIO_free(bioKey);
THROW("could not encrypt password");
}
memset(bufEncrypted.get(), 0, nRSASize);
+ EVP_PKEY_free(pubkey);
} else {
THROW("Could not initiate BIO");
}