diff options
Diffstat (limited to '')
| -rw-r--r-- | src/usr.bin/openssl/ca.c | 7 | ||||
| -rw-r--r-- | src/usr.bin/openssl/gendsa.c | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/usr.bin/openssl/ca.c b/src/usr.bin/openssl/ca.c index f4f07e76a2..3829715272 100644 --- a/src/usr.bin/openssl/ca.c +++ b/src/usr.bin/openssl/ca.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ca.c,v 1.9 2015/08/22 16:36:05 jsing Exp $ */ | 1 | /* $OpenBSD: ca.c,v 1.10 2015/09/10 02:17:17 lteo Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -88,15 +88,10 @@ | |||
| 88 | #define STRING_MASK "string_mask" | 88 | #define STRING_MASK "string_mask" |
| 89 | #define UTF8_IN "utf8" | 89 | #define UTF8_IN "utf8" |
| 90 | 90 | ||
| 91 | #define ENV_DIR "dir" | ||
| 92 | #define ENV_CERTS "certs" | ||
| 93 | #define ENV_CRL_DIR "crl_dir" | ||
| 94 | #define ENV_CA_DB "CA_DB" | ||
| 95 | #define ENV_NEW_CERTS_DIR "new_certs_dir" | 91 | #define ENV_NEW_CERTS_DIR "new_certs_dir" |
| 96 | #define ENV_CERTIFICATE "certificate" | 92 | #define ENV_CERTIFICATE "certificate" |
| 97 | #define ENV_SERIAL "serial" | 93 | #define ENV_SERIAL "serial" |
| 98 | #define ENV_CRLNUMBER "crlnumber" | 94 | #define ENV_CRLNUMBER "crlnumber" |
| 99 | #define ENV_CRL "crl" | ||
| 100 | #define ENV_PRIVATE_KEY "private_key" | 95 | #define ENV_PRIVATE_KEY "private_key" |
| 101 | #define ENV_DEFAULT_DAYS "default_days" | 96 | #define ENV_DEFAULT_DAYS "default_days" |
| 102 | #define ENV_DEFAULT_STARTDATE "default_startdate" | 97 | #define ENV_DEFAULT_STARTDATE "default_startdate" |
diff --git a/src/usr.bin/openssl/gendsa.c b/src/usr.bin/openssl/gendsa.c index 8f480525a0..4fbd0dce31 100644 --- a/src/usr.bin/openssl/gendsa.c +++ b/src/usr.bin/openssl/gendsa.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: gendsa.c,v 1.2 2015/08/22 16:36:05 jsing Exp $ */ | 1 | /* $OpenBSD: gendsa.c,v 1.3 2015/09/10 02:17:17 lteo Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -74,8 +74,6 @@ | |||
| 74 | #include <openssl/pem.h> | 74 | #include <openssl/pem.h> |
| 75 | #include <openssl/x509.h> | 75 | #include <openssl/x509.h> |
| 76 | 76 | ||
| 77 | #define DEFBITS 512 | ||
| 78 | |||
| 79 | int | 77 | int |
| 80 | gendsa_main(int argc, char **argv) | 78 | gendsa_main(int argc, char **argv) |
| 81 | { | 79 | { |
