Attachment 1259577 Details for Bug 1423341 – Possible patch for openssl 1.1 compatibility

[patch] Possible patch for openssl 1.1 compatibility

dpm-xrootd-openssl11.patch (text/plain), 4.72 KB, created by Mattias Ellert on 2017-03-03 15:44:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mattias Ellert

Created: 2017-03-03 15:44:53 UTC

Size: 4.72 KB

patch

obsolete

>diff -ur dpm-xrootd-3.6.3.orig/src/XrdDPMCommon.cc dpm-xrootd-3.6.3/src/XrdDPMCommon.cc
>--- dpm-xrootd-3.6.3.orig/src/XrdDPMCommon.cc	2016-10-10 15:37:48.000000000 +0200
>+++ dpm-xrootd-3.6.3/src/XrdDPMCommon.cc	2017-03-03 16:18:14.461963897 +0100
>@@ -47,6 +47,21 @@
> static pthread_key_t cm_key;
> static XrdSysLogger *theLp = 0;
> 
>+#if OPENSSL_VERSION_NUMBER < 0x10100000L
>+static HMAC_CTX* HMAC_CTX_new() {
>+  HMAC_CTX *ctx = (HMAC_CTX *)OPENSSL_malloc(sizeof(HMAC_CTX));
>+  if (ctx) HMAC_CTX_init(ctx);
>+  return ctx;
>+}
>+
>+static void HMAC_CTX_free(HMAC_CTX *ctx) {
>+  if (ctx) {
>+    HMAC_CTX_cleanup(ctx);
>+    OPENSSL_free(ctx);
>+  }
>+}
>+#endif
>+
> /******************************************************************************/
> /*                                 classes                                    */
> /******************************************************************************/
>@@ -485,7 +500,7 @@
>    size_t keylen) {
> 
>    unsigned int  iver, istart, istop;
>-   HMAC_CTX      ctx;
>+   HMAC_CTX      *ctx;
>    unsigned int  len;
>    unsigned char mdbuf[EVP_MAX_MD_SIZE];
>    char buf[64];
>@@ -509,7 +524,11 @@
>       return;
>    }
>    
>-   HMAC_CTX_init(&ctx);
>+   ctx = HMAC_CTX_new();
>+
>+   if (!ctx) {
>+      return;
>+   }
> 
>    class lguard {
>       public:
>@@ -517,7 +536,7 @@
>             ctx(ctx), hashes(hashes) { }
> 
>          ~lguard() {
>-            HMAC_CTX_cleanup(ctx);
>+            HMAC_CTX_free(ctx);
>             if (hashes) {
>                free(hashes[0]);
>                free(hashes[1]);
>@@ -529,7 +548,7 @@
>       private:
>          HMAC_CTX *ctx;
>          char **hashes;
>-   } guard(&ctx,hashes);
>+   } guard(ctx,hashes);
> 
>    bool first=1;
>    if (versions == 1 || versions == 2) {
>@@ -540,30 +559,30 @@
>    }
>    for(iver=istart;iver<=istop;++iver) {
>       if (first) {
>-         HMAC_Init_ex(&ctx, key, keylen, EVP_sha256(), 0);
>+         HMAC_Init_ex(ctx, key, keylen, EVP_sha256(), 0);
>       } else {
>-         HMAC_Init_ex(&ctx, 0, 0, 0, 0);
>+         HMAC_Init_ex(ctx, 0, 0, 0, 0);
>       }
>       first=0;
> 
>       if (iver >= 2) {
>          memset(buf, 0, 8);
>          buf[7] = iver;
>-         HMAC_Update(&ctx, (unsigned char *)buf, 8);
>+         HMAC_Update(ctx, (unsigned char *)buf, 8);
>       }
>    
>-      HMAC_Update(&ctx, (const unsigned char *)xrd_fn,
>+      HMAC_Update(ctx, (const unsigned char *)xrd_fn,
>          strlen(xrd_fn)+1);
>       if (iver == 1) {
>-         HMAC_Update(&ctx, (const unsigned char *)sfn,
>+         HMAC_Update(ctx, (const unsigned char *)sfn,
>             strlen(sfn)+1);
>       }
>-      HMAC_Update(&ctx, (const unsigned char *)dpmdhost,
>+      HMAC_Update(ctx, (const unsigned char *)dpmdhost,
>          strlen(dpmdhost)+1);
>       if (iver == 1) {
>-         HMAC_Update(&ctx, (const unsigned char *)pfn,
>+         HMAC_Update(ctx, (const unsigned char *)pfn,
>             strlen(pfn)+1);
>-         HMAC_Update(&ctx, (const unsigned char *)dpmtk,
>+         HMAC_Update(ctx, (const unsigned char *)dpmtk,
>             strlen(dpmtk)+1);
>       }
>    
>@@ -571,10 +590,10 @@
>       if (ret < 0 || (size_t)ret >= sizeof(buf)) {
>          return;
>       }
>-      HMAC_Update(&ctx, (unsigned char *)buf, strlen(buf)+1);
>+      HMAC_Update(ctx, (unsigned char *)buf, strlen(buf)+1);
>    
>-      HMAC_Update(&ctx, (const unsigned char *)dn, strlen(dn)+1);
>-      HMAC_Update(&ctx, (const unsigned char *)vomsnfo,
>+      HMAC_Update(ctx, (const unsigned char *)dn, strlen(dn)+1);
>+      HMAC_Update(ctx, (const unsigned char *)vomsnfo,
>          strlen(vomsnfo)+1);
> 
>       if (!localtime_r(&tim, &tms)) {
>@@ -589,26 +608,26 @@
>       if (ret < 0 || (size_t)ret >= n) {
>          return;
>       }
>-      HMAC_Update(&ctx, (unsigned char *)buf, strlen(buf)+1);
>-      HMAC_Update(&ctx, (unsigned char *)nonce, strlen(nonce)+1);
>+      HMAC_Update(ctx, (unsigned char *)buf, strlen(buf)+1);
>+      HMAC_Update(ctx, (unsigned char *)nonce, strlen(nonce)+1);
> 
>       if (iver >= 2) {
>-         HMAC_Update(&ctx, (unsigned char *)SafeCStr(locstr),
>+         HMAC_Update(ctx, (unsigned char *)SafeCStr(locstr),
>             locstr.length()+1);
>          n = chunkstr.size();
>          ret = snprintf(buf, sizeof(buf), "%u", (unsigned int)n);
>          if (ret < 0 || (size_t)ret >= sizeof(buf)) {
>             return;
>          }
>-         HMAC_Update(&ctx, (unsigned char *)buf, strlen(buf)+1);
>+         HMAC_Update(ctx, (unsigned char *)buf, strlen(buf)+1);
>          for(size_t idx=0;idx<n;++idx) {
>-            HMAC_Update(&ctx,
>+            HMAC_Update(ctx,
>                (unsigned char*)SafeCStr(chunkstr[idx]),
>                chunkstr[idx].length()+1);
>          }
>       }
>       len = 0;
>-      HMAC_Final(&ctx, mdbuf, &len);
>+      HMAC_Final(ctx, mdbuf, &len);
>       if (len < SHA256_DIGEST_LENGTH) {
>          return;
>       }

Actions: View | Diff

Attachments on bug 1423341: 1251771 | 1251772 | 1251773 | 1259577