[gsi] Fix some memory leaks when using Secgsi

xrootd · Jun 9, 2023 · c7175b4 · c7175b4
1 parent 2b42eba
commit c7175b4
Show file tree

Hide file tree

Showing 5 changed files with 165 additions and 78 deletions.
diff --git a/src/XrdCrypto/XrdCryptosslCipher.cc b/src/XrdCrypto/XrdCryptosslCipher.cc
@@ -902,6 +902,7 @@ bool XrdCryptosslCipher::Finalize(bool padded,
             EVP_PKEY_derive_set_peer(pkctx, peer);
             EVP_PKEY_derive(pkctx, (unsigned char *)ktmp, &ltmp);
             EVP_PKEY_CTX_free(pkctx);
+            EVP_PKEY_free(peer);
             if (ltmp > 0) {
 #if OPENSSL_VERSION_NUMBER < 0x10101000L
                if (padded) {

diff --git a/src/XrdCrypto/XrdCryptosslRSA.cc b/src/XrdCrypto/XrdCryptosslRSA.cc
@@ -322,6 +322,8 @@ int XrdCryptosslRSA::ImportPrivate(const char *pri, int lpri)
 
    if (!fEVP)
       return -1;
+
+   int rc = -1;
    prilen = -1;
 
    // Bio for exporting the pub key
@@ -337,9 +339,10 @@ int XrdCryptosslRSA::ImportPrivate(const char *pri, int lpri)
    if (PEM_read_bio_PrivateKey(bpri, &fEVP, 0, 0)) {
       // Update status
       status = kComplete;
-      return 0;
+      rc = 0;
    }
-   return -1;
+   BIO_free(bpri);
+   return rc;
 }
 
 //_____________________________________________________________________________