Changeset ab3ddbe for tools/traceanon/traceanon.cc

Timestamp:

01/16/19 11:47:53 (23 months ago)

Author:

Shane Alcock <salcock@…>

Branches:

develop

Children:

e4e33e9

Parents:

e9fe6ac

Message:

Rename global variable "key" to "enc_key"

This makes LGTM happy.

File:

• tools/traceanon/traceanon.cc (modified) (6 diffs)

tools/traceanon/traceanon.cc

@@ -49 +49 @@
 bool enc_dest_opt   = false;
 enum enc_type_t enc_type = ENC_NONE;
-char *key = NULL;
+char *enc_key = NULL;
 
 int level = -1;
@@ -221 +221 @@
 {
         if (enc_type == ENC_PREFIX_SUBSTITUTION) {
-                PrefixSub *sub = new PrefixSub(key, NULL);
+                PrefixSub *sub = new PrefixSub(enc_key, NULL);
                 return sub;
         }
 
         if (enc_type == ENC_CRYPTOPAN) {
-                if (strlen(key) < 32) {
+                if (strlen(enc_key) < 32) {
                         fprintf(stderr, "ERROR: Key must be at least 32 "
                         "characters long for CryptoPan anonymisation.\n");
@@ -232 +232 @@
                 }
 #ifdef HAVE_LIBCRYPTO                
-                CryptoAnon *anon = new CryptoAnon((uint8_t *)key,
-                        (uint8_t)strlen(key), 20);
+                CryptoAnon *anon = new CryptoAnon((uint8_t *)enc_key,
+                        (uint8_t)strlen(enc_key), 20);
                 return anon;
 #else
@@ -360 +360 @@
                         case 'd': enc_dest_opt  =true; break;
                         case 'c': 
-                                  if (key!=NULL) {
+                                  if (enc_key!=NULL) {
                                           fprintf(stderr,"You can only have one encryption type and one key\n");
                                           usage(argv[0]);
                                   }
-                                  key=strdup(optarg);
+                                  enc_key=strdup(optarg);
                                   enc_type = ENC_CRYPTOPAN;
                                   break;
                         case 'F': {
-                                  if(key != NULL) {
+                                  if(enc_key != NULL) {
                                     fprintf(stderr,"You can only have one encryption type and one key\n");
                                     usage(argv[0]);
@@ -377 +377 @@
                                     return 1;
                                   }
-                                  key = (char *) malloc(sizeof(char *) * 32);
-                                  if(fread(key,1,32,infile) != 32) {
+                                  enc_key = (char *) malloc(sizeof(char *) * 32);
+                                  if(fread(enc_key,1,32,infile) != 32) {
                                     if(ferror(infile)) {
                                       perror("Failed while reading cryptopan keyfile");
@@ -391 +391 @@
                                   break;
                         case 'p':
-                                  if (key!=NULL) {
+                                  if (enc_key!=NULL) {
                                           fprintf(stderr,"You can only have one encryption type and one key\n");
                                           usage(argv[0]);
                                   }
-                                  key=strdup(optarg);
+                                  enc_key=strdup(optarg);
                                   enc_type = ENC_PREFIX_SUBSTITUTION;
                                   break;