From ef0760efc6d1222454d6e5ac6a4506e28d9c8eb4 Mon Sep 17 00:00:00 2001
From: Ben Kibbey <bjk@luxsci.net>
Date: Sun, 12 Jul 2015 13:57:21 -0400
Subject: [PATCH] pwmc: add command line option --symmetric.

---
 src/pwmc.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/pwmc.c b/src/pwmc.c
index 88f5a360..b8e8350f 100644
--- a/src/pwmc.c
+++ b/src/pwmc.c
@@ -95,6 +95,7 @@ static char *filename;
 static int save;
 static char *keyid;
 static char *sign_keyid;
+static int symmetric;
 static char *keyparams;
 static char *keyfile;
 static char *new_keyfile;
@@ -229,6 +230,8 @@ usage (const char *pn, int status)
 	      "       the public key ID to u\n"
 	      "   --sign-keyid <string>\n"
 	      "       the key ID to sign the data file with\n"
+              "   --symmetric\n"
+              "       use conventional encryption with optional signer(s) for new files\n"
 	      "   --no-status\n"
 	      "       disable showing of status messages from the server\n"
               "   --status-ignore <string[,...]>\n"
@@ -1426,7 +1429,8 @@ finalize ()
   if (save && filename)
     {
       char *args =
-	pwmd_strdup_printf ("%s%s %s%s %s",
+	pwmd_strdup_printf ("%s %s%s %s%s %s",
+                            symmetric ? "--symmetric" : "",
 			    keyid ? "--keyid=" : "",
 			    keyid ? keyid : "",
 			    sign_keyid ? "--sign-keyid=" : "",
@@ -1541,7 +1545,7 @@ main (int argc, char *argv[])
     OPT_INQUIRE_FD, OPT_INQUIRE_FILE, OPT_INQUIRE_LINE, OPT_NO_STATUS,
     OPT_STATUS_IGNORE,
     OPT_STATUSFD, OPT_NAME, OPT_VERSION, OPT_HELP, OPT_KEYID, OPT_SIGN_KEYID,
-    OPT_KEYPARAMS, OPT_NO_PINENTRY, OPT_QUIET,
+    OPT_SYMMETRIC, OPT_KEYPARAMS, OPT_NO_PINENTRY, OPT_QUIET,
 #ifdef HAVE_LIBREADLINE
     OPT_INTERACTIVE,
 #endif
@@ -1593,6 +1597,7 @@ main (int argc, char *argv[])
     {"help", 0, 0, 0},
     {"keyid", 1, 0, 0},
     {"sign-keyid", 1, 0, 0},
+    {"symmetric", 0, 0, 0},
     {"key-params", 1, 0, 0},
     {"no-pinentry", 0, 0, 0},
     {"quiet", 0, 0, 0},
@@ -1602,9 +1607,9 @@ main (int argc, char *argv[])
     {0, 0, 0, 0}
   };
 #ifdef WITH_SSH
-  const char *optstring = "L:y:t:d:P:I:Sn:i:k:";
+  const char *optstring = "L:y:t:d:P:I:Sn:i:k:s";
 #else
-  const char *optstring = "L:y:t:d:P:I:Sn:";
+  const char *optstring = "L:y:t:d:P:I:Sn:s";
 #endif
   int opt_index = 0;
 
@@ -1663,6 +1668,9 @@ main (int argc, char *argv[])
 	      tls_fingerprint = optarg;
 	      break;
 #endif
+            case OPT_SYMMETRIC:
+              symmetric = 1;
+              break;
 	    case OPT_KEYPARAMS:
 	      keyparams = optarg;
 	      break;
-- 
2.11.4.GIT