Changeset 6d7f2a8

Timestamp:

Mar 17, 2010, 11:30:31 PM (14 years ago)

Author:

Nelson Elhage <nelhage@ksplice.com>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

e832a52

Parents:

8bd190d

git-author:

Nelson Elhage <nelhage@mit.edu> (04/29/09 23:43:39)

git-committer:

Nelson Elhage <nelhage@ksplice.com> (03/17/10 23:30:31)

Message:

zcrypt: Make encryption/decryption algorithms into a table.

File:

• zcrypt.c (modified) (3 diffs)

zcrypt.c

@@ -74 +74 @@
 #define M_SETKEY          5
 
-#define CIPHER_ERR        -1
-#define CIPHER_DES        0
-#define CIPHER_AES        1
+enum cipher_algo {
+  CIPHER_DES,
+  CIPHER_AES,
+  NCIPHER
+};
+
+typedef struct {
+  int (*encrypt)(char *keyfile, char *in, int len, FILE *out);
+  int (*decrypt)(char *keyfile);
+} cipher_pair;
+
+cipher_pair ciphers[NCIPHER] = {
+  [CIPHER_DES] { do_encrypt_des, do_decrypt_des},
+  [CIPHER_AES] { do_encrypt_aes, do_decrypt_aes},
+};
 
 static void owl_zcrypt_string_to_schedule(char *keystring, des_key_schedule *schedule) {
@@ -675 +687 @@
   }
 
-  switch(cipher) {
-  case CIPHER_DES:
-    out = do_encrypt_des(keyfile, inbuff, buflen, outfile);
-    break;
-  case CIPHER_AES:
-    out = do_encrypt_aes(keyfile, inbuff, buflen, outfile);
-    break;
-  }
+  out = ciphers[cipher].encrypt(keyfile, inbuff, buflen, outfile);
 
   if (zephyr)
@@ -829 +834 @@
 int do_decrypt(char *keyfile, int cipher)
 {
-  switch(cipher) {
-  case CIPHER_DES:
-    return do_decrypt_des(keyfile);
-  case CIPHER_AES:
-    return do_decrypt_aes(keyfile);
-  default:
-    return FALSE;
-  }
+  return ciphers[cipher].decrypt(keyfile);
 }