Changeset cb075c5 for tools/traceanon/Anon.cc

Timestamp:

03/02/17 13:46:56 (5 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, master, ndag_format, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance

Children:

684a21c

Parents:

4db5b98

Message:

Fix bug where traceanon would not build with newer versions
of libssl (>= 1.1.0).

File:

• tools/traceanon/Anon.cc (modified) (4 diffs)

tools/traceanon/Anon.cc

@@ -107 +107 @@
 
     this->cipher = EVP_aes_128_ecb();
-    EVP_CIPHER_CTX_init(&this->ctx);
-
-    EVP_EncryptInit_ex(&this->ctx, this->cipher, NULL, this->key, NULL);
+    this->ctx = EVP_CIPHER_CTX_new();
+    EVP_CIPHER_CTX_init(this->ctx);
+
+    EVP_EncryptInit_ex(this->ctx, this->cipher, NULL, this->key, NULL);
 
     this->cachebits = cachebits;
@@ -125 +126 @@
 CryptoAnon::~CryptoAnon() {
     delete(this->ipv4_cache);
-    EVP_CIPHER_CTX_cleanup(&this->ctx);
+    EVP_CIPHER_CTX_cleanup(this->ctx);
+    EVP_CIPHER_CTX_free(this->ctx);
 }
 
@@ -255 +257 @@
          * bit in the original address, we use the first bit of the resulting
          * encrypted output as part of an XOR mask */
-        EVP_EncryptUpdate(&this->ctx, (unsigned char *)rin_output, &outl, 
+        EVP_EncryptUpdate(this->ctx, (unsigned char *)rin_output, &outl, 
                 (unsigned char *)rin_input, 16);
 
@@ -290 +292 @@
         memcpy(rin_input, &input, 8);
 
-        EVP_EncryptUpdate(&this->ctx, (unsigned char *)rin_output, &outl,
+        EVP_EncryptUpdate(this->ctx, (unsigned char *)rin_output, &outl,
                 (unsigned char *)rin_input, 16);