diff options
| -rw-r--r-- | src/lib/libssl/src/apps/ca.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/lib/libssl/src/apps/ca.c b/src/lib/libssl/src/apps/ca.c index 22eade7363..f7b73189de 100644 --- a/src/lib/libssl/src/apps/ca.c +++ b/src/lib/libssl/src/apps/ca.c | |||
| @@ -195,48 +195,48 @@ certify(X509 ** xret, char *infile, EVP_PKEY * pkey, X509 * x509, | |||
| 195 | char *enddate, long days, int batch, char *ext_sect, CONF * conf, | 195 | char *enddate, long days, int batch, char *ext_sect, CONF * conf, |
| 196 | int verbose, unsigned long certopt, unsigned long nameopt, | 196 | int verbose, unsigned long certopt, unsigned long nameopt, |
| 197 | int default_op, int ext_copy, int selfsign); | 197 | int default_op, int ext_copy, int selfsign); |
| 198 | static int certify_cert(X509 ** xret, char *infile, EVP_PKEY * pkey, X509 * x509, | 198 | static int certify_cert(X509 ** xret, char *infile, EVP_PKEY * pkey, X509 * x509, |
| 199 | const EVP_MD * dgst, | 199 | const EVP_MD * dgst, |
| 200 | STACK_OF(OPENSSL_STRING) * sigopts, | 200 | STACK_OF(OPENSSL_STRING) * sigopts, |
| 201 | STACK_OF(CONF_VALUE) * policy, CA_DB * db, BIGNUM * serial, char *subj, | 201 | STACK_OF(CONF_VALUE) * policy, CA_DB * db, BIGNUM * serial, char *subj, |
| 202 | unsigned long chtype, int multirdn, int email_dn, char *startdate, | 202 | unsigned long chtype, int multirdn, int email_dn, char *startdate, |
| 203 | char *enddate, long days, int batch, char *ext_sect, CONF * conf, | 203 | char *enddate, long days, int batch, char *ext_sect, CONF * conf, |
| 204 | int verbose, unsigned long certopt, unsigned long nameopt, int default_op, | 204 | int verbose, unsigned long certopt, unsigned long nameopt, int default_op, |
| 205 | int ext_copy, ENGINE * e); | 205 | int ext_copy, ENGINE * e); |
| 206 | static int certify_spkac(X509 ** xret, char *infile, EVP_PKEY * pkey, X509 * x509, | 206 | static int certify_spkac(X509 ** xret, char *infile, EVP_PKEY * pkey, X509 * x509, |
| 207 | const EVP_MD * dgst, | 207 | const EVP_MD * dgst, |
| 208 | STACK_OF(OPENSSL_STRING) * sigopts, | 208 | STACK_OF(OPENSSL_STRING) * sigopts, |
| 209 | STACK_OF(CONF_VALUE) * policy, CA_DB * db, BIGNUM * serial, char *subj, | 209 | STACK_OF(CONF_VALUE) * policy, CA_DB * db, BIGNUM * serial, char *subj, |
| 210 | unsigned long chtype, int multirdn, int email_dn, char *startdate, | 210 | unsigned long chtype, int multirdn, int email_dn, char *startdate, |
| 211 | char *enddate, long days, char *ext_sect, CONF * conf, int verbose, | 211 | char *enddate, long days, char *ext_sect, CONF * conf, int verbose, |
| 212 | unsigned long certopt, unsigned long nameopt, int default_op, int ext_copy); | 212 | unsigned long certopt, unsigned long nameopt, int default_op, int ext_copy); |
| 213 | static void write_new_certificate(BIO * bp, X509 * x, int output_der, int notext); | 213 | static void write_new_certificate(BIO * bp, X509 * x, int output_der, int notext); |
| 214 | static int do_body(X509 ** xret, EVP_PKEY * pkey, X509 * x509, const EVP_MD * dgst, | 214 | static int do_body(X509 ** xret, EVP_PKEY * pkey, X509 * x509, const EVP_MD * dgst, |
| 215 | STACK_OF(OPENSSL_STRING) * sigopts, STACK_OF(CONF_VALUE) * policy, CA_DB * db, | 215 | STACK_OF(OPENSSL_STRING) * sigopts, STACK_OF(CONF_VALUE) * policy, CA_DB * db, |
| 216 | BIGNUM * serial, char *subj, unsigned long chtype, int multirdn, | 216 | BIGNUM * serial, char *subj, unsigned long chtype, int multirdn, |
| 217 | int email_dn, char *startdate, char *enddate, long days, int batch, | 217 | int email_dn, char *startdate, char *enddate, long days, int batch, |
| 218 | int verbose, X509_REQ * req, char *ext_sect, CONF * conf, | 218 | int verbose, X509_REQ * req, char *ext_sect, CONF * conf, |
| 219 | unsigned long certopt, unsigned long nameopt, int default_op, | 219 | unsigned long certopt, unsigned long nameopt, int default_op, |
| 220 | int ext_copy, int selfsign); | 220 | int ext_copy, int selfsign); |
| 221 | static int do_revoke(X509 * x509, CA_DB * db, int ext, char *extval); | 221 | static int do_revoke(X509 * x509, CA_DB * db, int ext, char *extval); |
| 222 | static int get_certificate_status(const char *ser_status, CA_DB * db); | 222 | static int get_certificate_status(const char *ser_status, CA_DB * db); |
| 223 | static int do_updatedb(CA_DB * db); | 223 | static int do_updatedb(CA_DB * db); |
| 224 | static int check_time_format(const char *str); | 224 | static int check_time_format(const char *str); |
| 225 | char *make_revocation_str(int rev_type, char *rev_arg); | 225 | char *make_revocation_str(int rev_type, char *rev_arg); |
| 226 | int make_revoked(X509_REVOKED * rev, const char *str); | 226 | int make_revoked(X509_REVOKED * rev, const char *str); |
| 227 | int old_entry_print(BIO * bp, ASN1_OBJECT * obj, ASN1_STRING * str); | 227 | int old_entry_print(BIO * bp, ASN1_OBJECT * obj, ASN1_STRING * str); |
| 228 | static CONF *conf = NULL; | 228 | static CONF *conf = NULL; |
| 229 | static CONF *extconf = NULL; | 229 | static CONF *extconf = NULL; |
| 230 | static char *section = NULL; | 230 | static char *section = NULL; |
| 231 | 231 | ||
| 232 | static int preserve = 0; | 232 | static int preserve = 0; |
| 233 | static int msie_hack = 0; | 233 | static int msie_hack = 0; |
| 234 | 234 | ||
| 235 | 235 | ||
| 236 | int ca_main(int, char **); | 236 | int ca_main(int, char **); |
| 237 | 237 | ||
| 238 | int | 238 | int |
| 239 | ca_main(int argc, char **argv) | 239 | ca_main(int argc, char **argv) |
| 240 | { | 240 | { |
| 241 | ENGINE *e = NULL; | 241 | ENGINE *e = NULL; |
| 242 | char *key = NULL, *passargin = NULL; | 242 | char *key = NULL, *passargin = NULL; |
