diff options
Diffstat (limited to 'src/certtool-args.h.bak')
| -rw-r--r-- | src/certtool-args.h.bak | 182 |
1 files changed, 91 insertions, 91 deletions
diff --git a/src/certtool-args.h.bak b/src/certtool-args.h.bak index 5cbe195edc..8413808d55 100644 --- a/src/certtool-args.h.bak +++ b/src/certtool-args.h.bak @@ -91,53 +91,53 @@ typedef enum { INDEX_OPT_P8_INFO = 26, INDEX_OPT_TO_RSA = 27, INDEX_OPT_GENERATE_PRIVKEY = 28, - INDEX_OPT_BITS = 29, - INDEX_OPT_CURVE = 30, - INDEX_OPT_SEC_PARAM = 31, - INDEX_OPT_TO_P8 = 32, - INDEX_OPT_PKCS8 = 33, - INDEX_OPT_PROVABLE = 34, - INDEX_OPT_VERIFY_PROVABLE_PRIVKEY = 35, - INDEX_OPT_SEED = 36, - INDEX_OPT_CRL_INFO = 38, - INDEX_OPT_GENERATE_CRL = 39, - INDEX_OPT_VERIFY_CRL = 40, - INDEX_OPT_VERIFY_CHAIN = 42, - INDEX_OPT_VERIFY = 43, - INDEX_OPT_VERIFY_HOSTNAME = 44, - INDEX_OPT_VERIFY_EMAIL = 45, - INDEX_OPT_VERIFY_PURPOSE = 46, - INDEX_OPT_VERIFY_ALLOW_BROKEN = 47, - INDEX_OPT_P7_GENERATE = 49, - INDEX_OPT_P7_SIGN = 50, - INDEX_OPT_P7_DETACHED_SIGN = 51, - INDEX_OPT_P7_INCLUDE_CERT = 52, - INDEX_OPT_P7_TIME = 53, - INDEX_OPT_P7_SHOW_DATA = 54, - INDEX_OPT_P7_INFO = 55, - INDEX_OPT_P7_VERIFY = 56, - INDEX_OPT_SMIME_TO_P7 = 57, - INDEX_OPT_GENERATE_DH_PARAMS = 59, - INDEX_OPT_GET_DH_PARAMS = 60, - INDEX_OPT_DH_INFO = 61, - INDEX_OPT_LOAD_PRIVKEY = 62, - INDEX_OPT_LOAD_PUBKEY = 63, - INDEX_OPT_LOAD_REQUEST = 64, - INDEX_OPT_LOAD_CERTIFICATE = 65, - INDEX_OPT_LOAD_CA_PRIVKEY = 66, - INDEX_OPT_LOAD_CA_CERTIFICATE = 67, - INDEX_OPT_LOAD_CRL = 68, - INDEX_OPT_LOAD_DATA = 69, - INDEX_OPT_PASSWORD = 70, - INDEX_OPT_NULL_PASSWORD = 71, - INDEX_OPT_EMPTY_PASSWORD = 72, - INDEX_OPT_HEX_NUMBERS = 73, - INDEX_OPT_CPRINT = 74, - INDEX_OPT_RSA = 75, - INDEX_OPT_DSA = 76, - INDEX_OPT_ECC = 77, - INDEX_OPT_ECDSA = 78, - INDEX_OPT_KEY_TYPE = 79, + INDEX_OPT_KEY_TYPE = 29, + INDEX_OPT_BITS = 30, + INDEX_OPT_CURVE = 31, + INDEX_OPT_SEC_PARAM = 32, + INDEX_OPT_TO_P8 = 33, + INDEX_OPT_PKCS8 = 34, + INDEX_OPT_PROVABLE = 35, + INDEX_OPT_VERIFY_PROVABLE_PRIVKEY = 36, + INDEX_OPT_SEED = 37, + INDEX_OPT_CRL_INFO = 39, + INDEX_OPT_GENERATE_CRL = 40, + INDEX_OPT_VERIFY_CRL = 41, + INDEX_OPT_VERIFY_CHAIN = 43, + INDEX_OPT_VERIFY = 44, + INDEX_OPT_VERIFY_HOSTNAME = 45, + INDEX_OPT_VERIFY_EMAIL = 46, + INDEX_OPT_VERIFY_PURPOSE = 47, + INDEX_OPT_VERIFY_ALLOW_BROKEN = 48, + INDEX_OPT_P7_GENERATE = 50, + INDEX_OPT_P7_SIGN = 51, + INDEX_OPT_P7_DETACHED_SIGN = 52, + INDEX_OPT_P7_INCLUDE_CERT = 53, + INDEX_OPT_P7_TIME = 54, + INDEX_OPT_P7_SHOW_DATA = 55, + INDEX_OPT_P7_INFO = 56, + INDEX_OPT_P7_VERIFY = 57, + INDEX_OPT_SMIME_TO_P7 = 58, + INDEX_OPT_GENERATE_DH_PARAMS = 60, + INDEX_OPT_GET_DH_PARAMS = 61, + INDEX_OPT_DH_INFO = 62, + INDEX_OPT_LOAD_PRIVKEY = 63, + INDEX_OPT_LOAD_PUBKEY = 64, + INDEX_OPT_LOAD_REQUEST = 65, + INDEX_OPT_LOAD_CERTIFICATE = 66, + INDEX_OPT_LOAD_CA_PRIVKEY = 67, + INDEX_OPT_LOAD_CA_CERTIFICATE = 68, + INDEX_OPT_LOAD_CRL = 69, + INDEX_OPT_LOAD_DATA = 70, + INDEX_OPT_PASSWORD = 71, + INDEX_OPT_NULL_PASSWORD = 72, + INDEX_OPT_EMPTY_PASSWORD = 73, + INDEX_OPT_HEX_NUMBERS = 74, + INDEX_OPT_CPRINT = 75, + INDEX_OPT_RSA = 76, + INDEX_OPT_DSA = 77, + INDEX_OPT_ECC = 78, + INDEX_OPT_ECDSA = 79, INDEX_OPT_HASH = 80, INDEX_OPT_SALT_SIZE = 81, INDEX_OPT_INDER = 82, @@ -237,55 +237,55 @@ typedef enum { #define VALUE_OPT_P8_INFO 0x100F #define VALUE_OPT_TO_RSA 0x1010 #define VALUE_OPT_GENERATE_PRIVKEY 'p' -#define VALUE_OPT_BITS 0x1011 +#define VALUE_OPT_KEY_TYPE 0x1011 +#define VALUE_OPT_BITS 0x1012 #define OPT_VALUE_BITS (DESC(BITS).optArg.argInt) -#define VALUE_OPT_CURVE 0x1012 -#define VALUE_OPT_SEC_PARAM 0x1013 -#define VALUE_OPT_TO_P8 0x1014 +#define VALUE_OPT_CURVE 0x1013 +#define VALUE_OPT_SEC_PARAM 0x1014 +#define VALUE_OPT_TO_P8 0x1015 #define VALUE_OPT_PKCS8 '8' -#define VALUE_OPT_PROVABLE 0x1015 -#define VALUE_OPT_VERIFY_PROVABLE_PRIVKEY 0x1016 -#define VALUE_OPT_SEED 0x1017 +#define VALUE_OPT_PROVABLE 0x1016 +#define VALUE_OPT_VERIFY_PROVABLE_PRIVKEY 0x1017 +#define VALUE_OPT_SEED 0x1018 #define VALUE_OPT_CRL_INFO 'l' -#define VALUE_OPT_GENERATE_CRL 0x1018 -#define VALUE_OPT_VERIFY_CRL 0x1019 +#define VALUE_OPT_GENERATE_CRL 0x1019 +#define VALUE_OPT_VERIFY_CRL 0x101A #define VALUE_OPT_VERIFY_CHAIN 'e' -#define VALUE_OPT_VERIFY 0x101A -#define VALUE_OPT_VERIFY_HOSTNAME 0x101B -#define VALUE_OPT_VERIFY_EMAIL 0x101C -#define VALUE_OPT_VERIFY_PURPOSE 0x101D -#define VALUE_OPT_VERIFY_ALLOW_BROKEN 0x101E -#define VALUE_OPT_P7_GENERATE 0x101F -#define VALUE_OPT_P7_SIGN 0x1020 -#define VALUE_OPT_P7_DETACHED_SIGN 0x1021 -#define VALUE_OPT_P7_INCLUDE_CERT 0x1022 -#define VALUE_OPT_P7_TIME 0x1023 -#define VALUE_OPT_P7_SHOW_DATA 0x1024 -#define VALUE_OPT_P7_INFO 0x1025 -#define VALUE_OPT_P7_VERIFY 0x1026 -#define VALUE_OPT_SMIME_TO_P7 0x1027 -#define VALUE_OPT_GENERATE_DH_PARAMS 0x1028 -#define VALUE_OPT_GET_DH_PARAMS 0x1029 -#define VALUE_OPT_DH_INFO 0x102A -#define VALUE_OPT_LOAD_PRIVKEY 0x102B -#define VALUE_OPT_LOAD_PUBKEY 0x102C -#define VALUE_OPT_LOAD_REQUEST 0x102D -#define VALUE_OPT_LOAD_CERTIFICATE 0x102E -#define VALUE_OPT_LOAD_CA_PRIVKEY 0x102F -#define VALUE_OPT_LOAD_CA_CERTIFICATE 0x1030 -#define VALUE_OPT_LOAD_CRL 0x1031 -#define VALUE_OPT_LOAD_DATA 0x1032 -#define VALUE_OPT_PASSWORD 0x1033 -#define VALUE_OPT_NULL_PASSWORD 0x1034 -#define VALUE_OPT_EMPTY_PASSWORD 0x1035 -#define VALUE_OPT_HEX_NUMBERS 0x1036 -#define VALUE_OPT_CPRINT 0x1037 -#define VALUE_OPT_RSA 0x1038 -#define VALUE_OPT_DSA 0x1039 -#define VALUE_OPT_ECC 0x103A -#define VALUE_OPT_ECDSA 0x103B -#define VALUE_OPT_KEY_TYPE 0x103C +#define VALUE_OPT_VERIFY 0x101B +#define VALUE_OPT_VERIFY_HOSTNAME 0x101C +#define VALUE_OPT_VERIFY_EMAIL 0x101D +#define VALUE_OPT_VERIFY_PURPOSE 0x101E +#define VALUE_OPT_VERIFY_ALLOW_BROKEN 0x101F +#define VALUE_OPT_P7_GENERATE 0x1020 +#define VALUE_OPT_P7_SIGN 0x1021 +#define VALUE_OPT_P7_DETACHED_SIGN 0x1022 +#define VALUE_OPT_P7_INCLUDE_CERT 0x1023 +#define VALUE_OPT_P7_TIME 0x1024 +#define VALUE_OPT_P7_SHOW_DATA 0x1025 +#define VALUE_OPT_P7_INFO 0x1026 +#define VALUE_OPT_P7_VERIFY 0x1027 +#define VALUE_OPT_SMIME_TO_P7 0x1028 +#define VALUE_OPT_GENERATE_DH_PARAMS 0x1029 +#define VALUE_OPT_GET_DH_PARAMS 0x102A +#define VALUE_OPT_DH_INFO 0x102B +#define VALUE_OPT_LOAD_PRIVKEY 0x102C +#define VALUE_OPT_LOAD_PUBKEY 0x102D +#define VALUE_OPT_LOAD_REQUEST 0x102E +#define VALUE_OPT_LOAD_CERTIFICATE 0x102F +#define VALUE_OPT_LOAD_CA_PRIVKEY 0x1030 +#define VALUE_OPT_LOAD_CA_CERTIFICATE 0x1031 +#define VALUE_OPT_LOAD_CRL 0x1032 +#define VALUE_OPT_LOAD_DATA 0x1033 +#define VALUE_OPT_PASSWORD 0x1034 +#define VALUE_OPT_NULL_PASSWORD 0x1035 +#define VALUE_OPT_EMPTY_PASSWORD 0x1036 +#define VALUE_OPT_HEX_NUMBERS 0x1037 +#define VALUE_OPT_CPRINT 0x1038 +#define VALUE_OPT_RSA 0x1039 +#define VALUE_OPT_DSA 0x103A +#define VALUE_OPT_ECC 0x103B +#define VALUE_OPT_ECDSA 0x103C #define VALUE_OPT_HASH 0x103D #define VALUE_OPT_SALT_SIZE 0x103E |