From: Niels Möller <nisse@lysator.liu.se>
Date: Wed, 23 Mar 2011 11:58:26 +0000 (+0100)
Subject: (main): Made the OPT_* constants local, and
X-Git-Tag: nettle_2.2_release_20110711~112
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a538a476b24ee1350c81123883e3334e8e1a8bc1;p=thirdparty%2Fnettle.git

(main): Made the OPT_* constants local, and
fixed numerical values to start with non-ASCII 0x300.

Rev: nettle/tools/pkcs1-conv.c:1.5
---

diff --git a/tools/pkcs1-conv.c b/tools/pkcs1-conv.c
index 7a37e3e0..c9c7ff4a 100644
--- a/tools/pkcs1-conv.c
+++ b/tools/pkcs1-conv.c
@@ -572,14 +572,6 @@ convert_file(struct nettle_buffer *buffer,
     }
 }
 
-enum {
-  OPT_PRIVATE_RSA = RSA_PRIVATE_KEY,
-  OPT_PUBLIC_RSA = RSA_PUBLIC_KEY,
-  OPT_PRIVATE_DSA = DSA_PRIVATE_KEY,
-  OPT_PUBLIC_KEY = GENERAL_PUBLIC_KEY,
-  OPT_HELP = 0x300,
-};
-
 int
 main(int argc, char **argv)
 {
@@ -587,6 +579,14 @@ main(int argc, char **argv)
   enum object_type type = 0;
   int base64 = 0;
   int c;
+
+  enum {
+    OPT_HELP = 0x300,
+    OPT_PRIVATE_RSA = RSA_PRIVATE_KEY,
+    OPT_PUBLIC_RSA = RSA_PUBLIC_KEY,
+    OPT_PRIVATE_DSA = DSA_PRIVATE_KEY,
+    OPT_PUBLIC_KEY = GENERAL_PUBLIC_KEY,
+  };
   
   static const struct option options[] =
     {