Changeset 33a106a
- Timestamp:
- 03/02/17 13:56:42 (4 years ago)
- 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. - Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
lib/trace_parallel.c
rdb84bb2 rf4fdcd1 1733 1733 ret = libtrace->format->start_input(libtrace); 1734 1734 } 1735 if (libtrace->perpkt_thread_count > 1) 1735 if (libtrace->perpkt_thread_count > 1) { 1736 1736 libtrace->pread = trace_pread_packet_first_in_first_served; 1737 1737 /* Don't wait for a burst of packets if the format is … … 1741 1741 libtrace->config.burst_size = 1; 1742 1742 } 1743 else 1743 } 1744 else { 1744 1745 /* Use standard read_packet */ 1745 1746 libtrace->pread = NULL; 1747 } 1746 1748 } 1747 1749 -
tools/traceanon/Anon.cc
ree6e802 rcb075c5 107 107 108 108 this->cipher = EVP_aes_128_ecb(); 109 EVP_CIPHER_CTX_init(&this->ctx); 110 111 EVP_EncryptInit_ex(&this->ctx, this->cipher, NULL, this->key, NULL); 109 this->ctx = EVP_CIPHER_CTX_new(); 110 EVP_CIPHER_CTX_init(this->ctx); 111 112 EVP_EncryptInit_ex(this->ctx, this->cipher, NULL, this->key, NULL); 112 113 113 114 this->cachebits = cachebits; … … 125 126 CryptoAnon::~CryptoAnon() { 126 127 delete(this->ipv4_cache); 127 EVP_CIPHER_CTX_cleanup(&this->ctx); 128 EVP_CIPHER_CTX_cleanup(this->ctx); 129 EVP_CIPHER_CTX_free(this->ctx); 128 130 } 129 131 … … 255 257 * bit in the original address, we use the first bit of the resulting 256 258 * encrypted output as part of an XOR mask */ 257 EVP_EncryptUpdate( &this->ctx, (unsigned char *)rin_output, &outl,259 EVP_EncryptUpdate(this->ctx, (unsigned char *)rin_output, &outl, 258 260 (unsigned char *)rin_input, 16); 259 261 … … 290 292 memcpy(rin_input, &input, 8); 291 293 292 EVP_EncryptUpdate( &this->ctx, (unsigned char *)rin_output, &outl,294 EVP_EncryptUpdate(this->ctx, (unsigned char *)rin_output, &outl, 293 295 (unsigned char *)rin_input, 16); 294 296 -
tools/traceanon/Anon.h
ree6e802 rcb075c5 86 86 uint32_t recent_ipv4_cache[2][2]; 87 87 const EVP_CIPHER *cipher; 88 EVP_CIPHER_CTX ctx;88 EVP_CIPHER_CTX *ctx; 89 89 90 90 uint32_t encrypt32Bits(uint32_t orig, uint8_t start, uint8_t stop, -
tools/traceanon/traceanon.cc
ree6e802 r684a21c 223 223 224 224 if (enc_type == ENC_CRYPTOPAN) { 225 if (strlen(key) < 32) { 226 fprintf(stderr, "ERROR: Key must be at least 32 " 227 "characters long for CryptoPan anonymisation.\n"); 228 exit(1); 229 } 225 230 #ifdef HAVE_LIBCRYPTO 226 231 CryptoAnon *anon = new CryptoAnon((uint8_t *)key,
Note: See TracChangeset
for help on using the changeset viewer.