From a538a476b24ee1350c81123883e3334e8e1a8bc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Wed, 23 Mar 2011 12:58:26 +0100
Subject: [PATCH] (main): Made the OPT_* constants local, and fixed numerical
values to start with non-ASCII 0x300.
Rev: nettle/tools/pkcs1-conv.c:1.5
---
tools/pkcs1-conv.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
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[] =
{
--
GitLab