Changeset 33a106a

Timestamp:

03/02/17 13:56:42 (4 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

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

Children:

ed3a238

Parents:

204d65b (diff), f4fdcd1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch '4.0.1-hotfixes' into develop

Files:

• lib/trace_parallel.c (modified) (2 diffs)
• tools/traceanon/Anon.cc (modified) (4 diffs)
• tools/traceanon/Anon.h (modified) (1 diff)
• tools/traceanon/traceanon.cc (modified) (1 diff)

lib/trace_parallel.c

@@ -1733 +1733 @@
                         ret = libtrace->format->start_input(libtrace);
                 }
-                if (libtrace->perpkt_thread_count > 1)
+                if (libtrace->perpkt_thread_count > 1) {
                         libtrace->pread = trace_pread_packet_first_in_first_served;
                         /* Don't wait for a burst of packets if the format is
@@ -1741 +1741 @@
                                 libtrace->config.burst_size = 1;
                         }
-                else
+                }
+                else {
                         /* Use standard read_packet */
                         libtrace->pread = NULL;
+                }
         }
 

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);
 

tools/traceanon/Anon.h

@@ -86 +86 @@
     uint32_t recent_ipv4_cache[2][2];
     const EVP_CIPHER *cipher;
-    EVP_CIPHER_CTX ctx;
+    EVP_CIPHER_CTX *ctx;
 
     uint32_t encrypt32Bits(uint32_t orig, uint8_t start, uint8_t stop,

tools/traceanon/traceanon.cc

@@ -223 +223 @@
 
         if (enc_type == ENC_CRYPTOPAN) {
+                if (strlen(key) < 32) {
+                        fprintf(stderr, "ERROR: Key must be at least 32 "
+                        "characters long for CryptoPan anonymisation.\n");
+                        exit(1);
+                }
 #ifdef HAVE_LIBCRYPTO                
                 CryptoAnon *anon = new CryptoAnon((uint8_t *)key,