rejected-patched-source-file

cryptcab.c.rej (text/x-reject), 1.87 KB, created by Amel Hodzic on 2019-04-29 23:35:54 UTC

--- src/vde_cryptcab/cryptcab.c 2011-11-23 18:41:17.000000000 +0200
+++ src/vde_cryptcab/cryptcab.c 2018-12-29 13:37:10.479813884 +0200
@@ -22,7 +22,7 @@
  exit(1);
 }
  
-static EVP_CIPHER_CTX ctx;
+static EVP_CIPHER_CTX *ctx;
 static int ctx_initialized = 0;
 static int encryption_disabled = 0;
 static int nfd;
@@ -107,19 +111,21 @@
  }
 
  if (!ctx_initialized) {
-  EVP_CIPHER_CTX_init (&ctx);
+  ctx = EVP_CIPHER_CTX_new ();
+  if (!ctx)
+   return -1;
   ctx_initialized = 1;
  }
  
- EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
- if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1)
+ EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
+ if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1)
  {
   fprintf (stderr,"error in encrypt update\n");
   olen = -1;
   goto cleanup;
  }
 
- if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1)
+ if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1)
  {
   fprintf (stderr,"error in encrypt final\n");
   olen = -1;
@@ -128,7 +134,7 @@
  olen += tlen;
 
 cleanup:
- EVP_CIPHER_CTX_cleanup(&ctx); 
+ EVP_CIPHER_CTX_reset(ctx);
  return olen;
 }
 
@@ -142,19 +148,21 @@
  }
  
  if (!ctx_initialized) {
-  EVP_CIPHER_CTX_init (&ctx);
+  ctx = EVP_CIPHER_CTX_new ();
+  if (!ctx)
+   return -1;
   ctx_initialized = 1;
  }
 
- EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
- if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1)
+ EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
+ if (EVP_DecryptUpdate (ctx, dst, &olen, src, olen) != 1)
  {
   fprintf (stderr,"error in decrypt update\n");
   olen = -1;
   goto cleanup;
  }
 
- if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1)
+ if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1)
  {
   fprintf (stderr,"error in decrypt final\n");
   olen = -1;
@@ -163,7 +171,7 @@
  olen += tlen;
 
 cleanup:
- EVP_CIPHER_CTX_cleanup(&ctx); 
+ EVP_CIPHER_CTX_reset (ctx);
  return olen;
 }