| x509.c (1.1.1.9) | x509.c (1.1.1.10) |
|---|---|
| 1/* apps/x509.c */ 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 3 * All rights reserved. 4 * 5 * This package is an SSL implementation written 6 * by Eric Young (eay@cryptsoft.com). 7 * The implementation was written so as to conform with Netscapes SSL. 8 * --- 204 unchanged lines hidden (view full) --- 213 CONF *extconf = NULL; 214 char *extsect = NULL, *extfile = NULL, *passin = NULL, *passargin = NULL; 215 int need_rand = 0; 216 int checkend = 0, checkoffset = 0; 217 unsigned long nmflag = 0, certflag = 0; 218 char *checkhost = NULL; 219 char *checkemail = NULL; 220 char *checkip = NULL; | 1/* apps/x509.c */ 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 3 * All rights reserved. 4 * 5 * This package is an SSL implementation written 6 * by Eric Young (eay@cryptsoft.com). 7 * The implementation was written so as to conform with Netscapes SSL. 8 * --- 204 unchanged lines hidden (view full) --- 213 CONF *extconf = NULL; 214 char *extsect = NULL, *extfile = NULL, *passin = NULL, *passargin = NULL; 215 int need_rand = 0; 216 int checkend = 0, checkoffset = 0; 217 unsigned long nmflag = 0, certflag = 0; 218 char *checkhost = NULL; 219 char *checkemail = NULL; 220 char *checkip = NULL; |
| 221#ifndef OPENSSL_NO_ENGINE | |
| 222 char *engine = NULL; | 221 char *engine = NULL; |
| 223#endif | |
| 224 225 reqfile = 0; 226 227 apps_startup(); 228 229 if (bio_err == NULL) 230 bio_err = BIO_new_fp(stderr, BIO_NOCLOSE); 231 --- 264 unchanged lines hidden (view full) --- 496 } 497 498 if (badops) { 499 bad: 500 for (pp = x509_usage; (*pp != NULL); pp++) 501 BIO_printf(bio_err, "%s", *pp); 502 goto end; 503 } | 222 223 reqfile = 0; 224 225 apps_startup(); 226 227 if (bio_err == NULL) 228 bio_err = BIO_new_fp(stderr, BIO_NOCLOSE); 229 --- 264 unchanged lines hidden (view full) --- 494 } 495 496 if (badops) { 497 bad: 498 for (pp = x509_usage; (*pp != NULL); pp++) 499 BIO_printf(bio_err, "%s", *pp); 500 goto end; 501 } |
| 504#ifndef OPENSSL_NO_ENGINE | |
| 505 e = setup_engine(bio_err, engine, 0); | 502 e = setup_engine(bio_err, engine, 0); |
| 506#endif | |
| 507 508 if (need_rand) 509 app_RAND_load_file(NULL, bio_err, 0); 510 511 ERR_load_crypto_strings(); 512 513 if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) { 514 BIO_printf(bio_err, "Error getting password\n"); --- 520 unchanged lines hidden (view full) --- 1035 EVP_PKEY_free(CApkey); 1036 EVP_PKEY_free(fkey); 1037 if (sigopts) 1038 sk_OPENSSL_STRING_free(sigopts); 1039 X509_REQ_free(rq); 1040 ASN1_INTEGER_free(sno); 1041 sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free); 1042 sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free); | 503 504 if (need_rand) 505 app_RAND_load_file(NULL, bio_err, 0); 506 507 ERR_load_crypto_strings(); 508 509 if (!app_passwd(bio_err, passargin, NULL, &passin, NULL)) { 510 BIO_printf(bio_err, "Error getting password\n"); --- 520 unchanged lines hidden (view full) --- 1031 EVP_PKEY_free(CApkey); 1032 EVP_PKEY_free(fkey); 1033 if (sigopts) 1034 sk_OPENSSL_STRING_free(sigopts); 1035 X509_REQ_free(rq); 1036 ASN1_INTEGER_free(sno); 1037 sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free); 1038 sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free); |
| 1039 release_engine(e); |
|
| 1043 if (passin) 1044 OPENSSL_free(passin); 1045 apps_shutdown(); 1046 OPENSSL_EXIT(ret); 1047} 1048 1049static ASN1_INTEGER *x509_load_serial(char *CAfile, char *serialfile, 1050 int create) --- 231 unchanged lines hidden --- | 1040 if (passin) 1041 OPENSSL_free(passin); 1042 apps_shutdown(); 1043 OPENSSL_EXIT(ret); 1044} 1045 1046static ASN1_INTEGER *x509_load_serial(char *CAfile, char *serialfile, 1047 int create) --- 231 unchanged lines hidden --- |