cryptocipher: allow setIV to set only the cipher length

xrootd · Dec 21, 2018 · c42212e · c42212e
1 parent 5e7a5e6
commit c42212e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/XrdCrypto/XrdCryptoCipher.cc b/src/XrdCrypto/XrdCryptoCipher.cc
@@ -58,7 +58,7 @@ bool XrdCryptoCipher::IsValid()
 //____________________________________________________________________________
 void XrdCryptoCipher::SetIV(int l, const char *iv)
 {
-   // Set IV from l bytes at iv
+   // Set IV from l bytes at iv. If !iv, sets the IV length.
 
    ABSTRACTMETHOD("XrdCryptoCipher::SetIV");
 }

diff --git a/src/XrdCrypto/XrdCryptosslCipher.cc b/src/XrdCrypto/XrdCryptosslCipher.cc
@@ -963,20 +963,20 @@ XrdSutBucket *XrdCryptosslCipher::AsBucket()
 //____________________________________________________________________________
 void XrdCryptosslCipher::SetIV(int l, const char *iv)
 {
-   // Set IV from l bytes at iv
+   // Set IV from l bytes at iv. If !iv, sets the IV length.
 
    if (fIV) {
       delete[] fIV;
       fIV = 0;
       lIV = 0;
    }
 
-   if (iv && l > 0) {
-      fIV = new char[l];
-      if (fIV) {
-         memcpy(fIV,iv,l);
-         lIV = l;
+   if (l > 0) {
+      if (iv) {
+         fIV = new char[l];
+         if (fIV) memcpy(fIV,iv,l);
       }
+      lIV = l;
    }
 }
 
@@ -1127,5 +1127,5 @@ int XrdCryptosslCipher::MaxIVLength() const
 {
    // Return the max cipher IV length
 
-   return EVP_MAX_IV_LENGTH;
+   return (lIV > 0) ? lIV : EVP_MAX_IV_LENGTH;
 }