Initialize num properly.
[openssl.git] / apps / x509.c
index fa8537e..1b612d1 100644 (file)
  * [including the GNU Public Licence.]
  */
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef NO_STDIO
+#ifdef OPENSSL_NO_STDIO
 #define APPS_WIN16
 #endif
 #include "apps.h"
-#include "bio.h"
-#include "asn1.h"
-#include "err.h"
-#include "bn.h"
-#include "evp.h"
-#include "x509.h"
-#include "objects.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/x509v3.h>
+#include <openssl/objects.h>
+#include <openssl/pem.h>
+#ifndef OPENSSL_NO_RSA
+#include <openssl/rsa.h>
+#endif
+#ifndef OPENSSL_NO_DSA
+#include <openssl/dsa.h>
+#endif
 
 #undef PROG
 #define PROG x509_main
 #define        POSTFIX ".srl"
 #define DEF_DAYS       30
 
-#define CERT_HDR       "certificate"
-
-static char *x509_usage[]={
+static const char *x509_usage[]={
 "usage: x509 args\n",
 " -inform arg     - input format - default PEM (one of DER, NET or PEM)\n",
-" -outform arg    - output format - default PEM (one of DER, NET or PEM\n",
+" -outform arg    - output format - default PEM (one of DER, NET or PEM)\n",
 " -keyform arg    - private key format - default PEM\n",
 " -CAform arg     - CA format - default PEM\n",
 " -CAkeyform arg  - CA key format - default PEM\n",
 " -in arg         - input file - default stdin\n",
 " -out arg        - output file - default stdout\n",
+" -passin arg     - private key password source\n",
 " -serial         - print serial number value\n",
-" -hash           - print hash value\n",
+" -subject_hash   - print subject hash value\n",
+#ifndef OPENSSL_NO_MD5
+" -subject_hash_old   - print old-style (MD5) subject hash value\n",
+#endif
+" -issuer_hash    - print issuer hash value\n",
+#ifndef OPENSSL_NO_MD5
+" -issuer_hash_old    - print old-style (MD5) issuer hash value\n",
+#endif
+" -hash           - synonym for -subject_hash\n",
 " -subject        - print subject DN\n",
 " -issuer         - print issuer DN\n",
+" -email          - print email address(es)\n",
 " -startdate      - notBefore field\n",
 " -enddate        - notAfter field\n",
+" -purpose        - print out certificate purposes\n",
 " -dates          - both Before and After dates\n",
 " -modulus        - print the RSA key modulus\n",
+" -pubkey         - output the public key\n",
 " -fingerprint    - print the certificate fingerprint\n",
+" -alias          - output certificate alias\n",
 " -noout          - no certificate output\n",
-
+" -ocspid         - print OCSP hash values for the subject name and public key\n",
+" -ocsp_uri       - print OCSP Responder URL(s)\n",
+" -trustout       - output a \"trusted\" certificate\n",
+" -clrtrust       - clear all trusted purposes\n",
+" -clrreject      - clear all rejected purposes\n",
+" -addtrust arg   - trust certificate for a given purpose\n",
+" -addreject arg  - reject certificate for a given purpose\n",
+" -setalias arg   - set certificate alias\n",
 " -days arg       - How long till expiry of a signed certificate - def 30 days\n",
+" -checkend arg   - check whether the cert expires in the next arg seconds\n",
+"                   exit 1 if so, 0 if not\n",
 " -signkey arg    - self sign cert with arg\n",
 " -x509toreq      - output a certification request object\n",
 " -req            - input is a certificate request, sign and output.\n",
 " -CA arg         - set the CA certificate, must be PEM format.\n",
 " -CAkey arg      - set the CA key, must be PEM format\n",
-"                   missing, it is asssumed to be in the CA file.\n",
+"                   missing, it is assumed to be in the CA file.\n",
 " -CAcreateserial - create serial number file if it does not exist\n",
-" -CAserial       - serial file\n",
+" -CAserial arg   - serial file\n",
+" -set_serial     - serial number to use\n",
 " -text           - print the certificate in text form\n",
 " -C              - print out C code forms\n",
-" -md2/-md5/-sha1/-mdc2 - digest to do an RSA sign with\n",
+" -md2/-md5/-sha1/-mdc2 - digest to use\n",
+" -extfile        - configuration file with X509V3 extensions to add\n",
+" -extensions     - section from config file with X509V3 extensions to add\n",
+" -clrext         - delete extensions before signing and input certificate\n",
+" -nameopt arg    - various certificate name options\n",
+#ifndef OPENSSL_NO_ENGINE
+" -engine e       - use engine e, possibly a hardware device.\n",
+#endif
+" -certopt arg    - various certificate text options\n",
+" -checkhost host - check certificate matches \"host\"\n",
+" -checkemail email - check certificate matches \"email\"\n",
+" -checkip ipaddr - check certificate matches \"ipaddr\"\n",
 NULL
 };
 
-#ifndef NOPROTO
 static int MS_CALLBACK callb(int ok, X509_STORE_CTX *ctx);
-static EVP_PKEY *load_key(char *file, int format);
-static X509 *load_cert(char *file, int format);
-static int sign (X509 *x, EVP_PKEY *pkey,int days,EVP_MD *digest);
-static int x509_certify (X509_STORE *ctx,char *CAfile, EVP_MD *digest,X509 *x,
-       X509 *xca, EVP_PKEY *pkey,char *serial, int create, int days);
-#else
-static int MS_CALLBACK callb();
-static EVP_PKEY *load_key();
-static X509 *load_cert();
-static int sign ();
-static int x509_certify ();
+static int sign (X509 *x, EVP_PKEY *pkey,int days,int clrext, const EVP_MD *digest,
+                                               CONF *conf, char *section);
+static int x509_certify (X509_STORE *ctx,char *CAfile,const EVP_MD *digest,
+                        X509 *x,X509 *xca,EVP_PKEY *pkey,
+                        STACK_OF(OPENSSL_STRING) *sigopts,
+                        char *serial, int create ,int days, int clrext,
+                        CONF *conf, char *section, ASN1_INTEGER *sno);
+static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt);
+static int reqfile=0;
+#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL
+static int force_version=2;
 #endif
 
-static int reqfile=0;
+int MAIN(int, char **);
 
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int argc, char **argv)
        {
+       ENGINE *e = NULL;
        int ret=1;
        X509_REQ *req=NULL;
        X509 *x=NULL,*xca=NULL;
-       EVP_PKEY *Upkey=NULL,*CApkey=NULL;
-       int i,num,badops=0;
+       ASN1_OBJECT *objtmp;
+       STACK_OF(OPENSSL_STRING) *sigopts = NULL;
+       EVP_PKEY *Upkey=NULL,*CApkey=NULL, *fkey = NULL;
+       ASN1_INTEGER *sno = NULL;
+       int i,num,badops=0, badsig=0;
        BIO *out=NULL;
        BIO *STDout=NULL;
+       STACK_OF(ASN1_OBJECT) *trust = NULL, *reject = NULL;
        int informat,outformat,keyformat,CAformat,CAkeyformat;
        char *infile=NULL,*outfile=NULL,*keyfile=NULL,*CAfile=NULL;
        char *CAkeyfile=NULL,*CAserial=NULL;
-       int text=0,serial=0,hash=0,subject=0,issuer=0,startdate=0,enddate=0;
-       int noout=0,sign_flag=0,CA_flag=0,CA_createserial=0;
+       char *fkeyfile=NULL;
+       char *alias=NULL;
+       int text=0,serial=0,subject=0,issuer=0,startdate=0,enddate=0;
+       int next_serial=0;
+       int subject_hash=0,issuer_hash=0,ocspid=0;
+#ifndef OPENSSL_NO_MD5
+       int subject_hash_old=0,issuer_hash_old=0;
+#endif
+       int noout=0,sign_flag=0,CA_flag=0,CA_createserial=0,email=0;
+       int ocsp_uri=0;
+       int trustout=0,clrtrust=0,clrreject=0,aliasout=0,clrext=0;
        int C=0;
-       int x509req=0,days=DEF_DAYS,modulus=0;
-       char **pp;
+       int x509req=0,days=DEF_DAYS,modulus=0,pubkey=0;
+       int pprint = 0;
+       const char **pp;
        X509_STORE *ctx=NULL;
        X509_REQ *rq=NULL;
        int fingerprint=0;
        char buf[256];
-       EVP_MD *md_alg,*digest=EVP_md5();
+       const EVP_MD *md_alg,*digest=NULL;
+       CONF *extconf = NULL;
+       char *extsect = NULL, *extfile = NULL, *passin = NULL, *passargin = NULL;
+       int need_rand = 0;
+       int checkend=0,checkoffset=0;
+       unsigned long nmflag = 0, certflag = 0;
+       unsigned char *checkhost = NULL, *checkemail = NULL;
+       char *checkip = NULL;
+#ifndef OPENSSL_NO_ENGINE
+       char *engine=NULL;
+#endif
 
        reqfile=0;
 
@@ -164,7 +226,16 @@ char **argv;
 
        if (bio_err == NULL)
                bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+
+       if (!load_config(bio_err, NULL))
+               goto end;
        STDout=BIO_new_fp(stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+       {
+       BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+       STDout = BIO_push(tmpbio, STDout);
+       }
+#endif
 
        informat=FORMAT_PEM;
        outformat=FORMAT_PEM;
@@ -174,7 +245,7 @@ char **argv;
 
        ctx=X509_STORE_new();
        if (ctx == NULL) goto end;
-       X509_STORE_set_verify_cb_func(ctx,callb);
+       X509_STORE_set_verify_cb(ctx,callb);
 
        argc--;
        argv++;
@@ -197,7 +268,10 @@ char **argv;
                        keyformat=str2fmt(*(++argv));
                        }
                else if (strcmp(*argv,"-req") == 0)
+                       {
                        reqfile=1;
+                       need_rand = 1;
+                       }
                else if (strcmp(*argv,"-CAform") == 0)
                        {
                        if (--argc < 1) goto bad;
@@ -206,18 +280,49 @@ char **argv;
                else if (strcmp(*argv,"-CAkeyform") == 0)
                        {
                        if (--argc < 1) goto bad;
-                       CAformat=str2fmt(*(++argv));
+                       CAkeyformat=str2fmt(*(++argv));
                        }
+               else if (strcmp(*argv,"-sigopt") == 0)
+                       {
+                       if (--argc < 1)
+                               goto bad;
+                       if (!sigopts)
+                               sigopts = sk_OPENSSL_STRING_new_null();
+                       if (!sigopts || !sk_OPENSSL_STRING_push(sigopts, *(++argv)))
+                               goto bad;
+                       }
+#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL
+               else if (strcmp(*argv,"-force_version") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       force_version=atoi(*(++argv)) - 1;
+                       }
+#endif
                else if (strcmp(*argv,"-days") == 0)
                        {
                        if (--argc < 1) goto bad;
                        days=atoi(*(++argv));
                        if (days == 0)
                                {
-                               BIO_printf(STDout,"bad number of days\n");
+                               BIO_printf(bio_err,"bad number of days\n");
                                goto bad;
                                }
                        }
+               else if (strcmp(*argv,"-passin") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       passargin= *(++argv);
+                       }
+               else if (strcmp(*argv,"-extfile") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       extfile= *(++argv);
+                       }
+               else if (strcmp(*argv,"-extensions") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       extsect= *(++argv);
+                       }
                else if (strcmp(*argv,"-in") == 0)
                        {
                        if (--argc < 1) goto bad;
@@ -233,12 +338,14 @@ char **argv;
                        if (--argc < 1) goto bad;
                        keyfile= *(++argv);
                        sign_flag= ++num;
+                       need_rand = 1;
                        }
                else if (strcmp(*argv,"-CA") == 0)
                        {
                        if (--argc < 1) goto bad;
                        CAfile= *(++argv);
                        CA_flag= ++num;
+                       need_rand = 1;
                        }
                else if (strcmp(*argv,"-CAkey") == 0)
                        {
@@ -250,18 +357,97 @@ char **argv;
                        if (--argc < 1) goto bad;
                        CAserial= *(++argv);
                        }
+               else if (strcmp(*argv,"-set_serial") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       if (!(sno = s2i_ASN1_INTEGER(NULL, *(++argv))))
+                               goto bad;
+                       }
+               else if (strcmp(*argv,"-force_pubkey") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       fkeyfile= *(++argv);
+                       }
+               else if (strcmp(*argv,"-addtrust") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       if (!(objtmp = OBJ_txt2obj(*(++argv), 0)))
+                               {
+                               BIO_printf(bio_err,
+                                       "Invalid trust object value %s\n", *argv);
+                               goto bad;
+                               }
+                       if (!trust) trust = sk_ASN1_OBJECT_new_null();
+                       sk_ASN1_OBJECT_push(trust, objtmp);
+                       trustout = 1;
+                       }
+               else if (strcmp(*argv,"-addreject") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       if (!(objtmp = OBJ_txt2obj(*(++argv), 0)))
+                               {
+                               BIO_printf(bio_err,
+                                       "Invalid reject object value %s\n", *argv);
+                               goto bad;
+                               }
+                       if (!reject) reject = sk_ASN1_OBJECT_new_null();
+                       sk_ASN1_OBJECT_push(reject, objtmp);
+                       trustout = 1;
+                       }
+               else if (strcmp(*argv,"-setalias") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       alias= *(++argv);
+                       trustout = 1;
+                       }
+               else if (strcmp(*argv,"-certopt") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       if (!set_cert_ex(&certflag, *(++argv))) goto bad;
+                       }
+               else if (strcmp(*argv,"-nameopt") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       if (!set_name_ex(&nmflag, *(++argv))) goto bad;
+                       }
+#ifndef OPENSSL_NO_ENGINE
+               else if (strcmp(*argv,"-engine") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       engine= *(++argv);
+                       }
+#endif
                else if (strcmp(*argv,"-C") == 0)
                        C= ++num;
+               else if (strcmp(*argv,"-email") == 0)
+                       email= ++num;
+               else if (strcmp(*argv,"-ocsp_uri") == 0)
+                       ocsp_uri= ++num;
                else if (strcmp(*argv,"-serial") == 0)
                        serial= ++num;
+               else if (strcmp(*argv,"-next_serial") == 0)
+                       next_serial= ++num;
                else if (strcmp(*argv,"-modulus") == 0)
                        modulus= ++num;
+               else if (strcmp(*argv,"-pubkey") == 0)
+                       pubkey= ++num;
                else if (strcmp(*argv,"-x509toreq") == 0)
                        x509req= ++num;
                else if (strcmp(*argv,"-text") == 0)
                        text= ++num;
-               else if (strcmp(*argv,"-hash") == 0)
-                       hash= ++num;
+               else if (strcmp(*argv,"-hash") == 0
+                       || strcmp(*argv,"-subject_hash") == 0)
+                       subject_hash= ++num;
+#ifndef OPENSSL_NO_MD5
+               else if (strcmp(*argv,"-subject_hash_old") == 0)
+                       subject_hash_old= ++num;
+#endif
+               else if (strcmp(*argv,"-issuer_hash") == 0)
+                       issuer_hash= ++num;
+#ifndef OPENSSL_NO_MD5
+               else if (strcmp(*argv,"-issuer_hash_old") == 0)
+                       issuer_hash_old= ++num;
+#endif
                else if (strcmp(*argv,"-subject") == 0)
                        subject= ++num;
                else if (strcmp(*argv,"-issuer") == 0)
@@ -273,15 +459,59 @@ char **argv;
                        startdate= ++num;
                        enddate= ++num;
                        }
+               else if (strcmp(*argv,"-purpose") == 0)
+                       pprint= ++num;
                else if (strcmp(*argv,"-startdate") == 0)
                        startdate= ++num;
                else if (strcmp(*argv,"-enddate") == 0)
                        enddate= ++num;
+               else if (strcmp(*argv,"-checkend") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       checkoffset=atoi(*(++argv));
+                       checkend=1;
+                       }
+               else if (strcmp(*argv,"-checkhost") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       checkhost=(unsigned char *)*(++argv);
+                       }
+               else if (strcmp(*argv,"-checkemail") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       checkemail=(unsigned char *)*(++argv);
+                       }
+               else if (strcmp(*argv,"-checkip") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       checkip=*(++argv);
+                       }
                else if (strcmp(*argv,"-noout") == 0)
                        noout= ++num;
+               else if (strcmp(*argv,"-trustout") == 0)
+                       trustout= 1;
+               else if (strcmp(*argv,"-clrtrust") == 0)
+                       clrtrust= ++num;
+               else if (strcmp(*argv,"-clrreject") == 0)
+                       clrreject= ++num;
+               else if (strcmp(*argv,"-alias") == 0)
+                       aliasout= ++num;
                else if (strcmp(*argv,"-CAcreateserial") == 0)
                        CA_createserial= ++num;
-               else if ((md_alg=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
+               else if (strcmp(*argv,"-clrext") == 0)
+                       clrext = 1;
+#if 1 /* stay backwards-compatible with 0.9.5; this should go away soon */
+               else if (strcmp(*argv,"-crlext") == 0)
+                       {
+                       BIO_printf(bio_err,"use -clrext instead of -crlext\n");
+                       clrext = 1;
+                       }
+#endif
+               else if (strcmp(*argv,"-ocspid") == 0)
+                       ocspid= ++num;
+               else if (strcmp(*argv,"-badsig") == 0)
+                       badsig = 1;
+               else if ((md_alg=EVP_get_digestbyname(*argv + 1)))
                        {
                        /* ok */
                        digest=md_alg;
@@ -300,12 +530,24 @@ char **argv;
                {
 bad:
                for (pp=x509_usage; (*pp != NULL); pp++)
-                       BIO_printf(bio_err,*pp);
+                       BIO_printf(bio_err,"%s",*pp);
                goto end;
                }
 
+#ifndef OPENSSL_NO_ENGINE
+        e = setup_engine(bio_err, engine, 0);
+#endif
+
+       if (need_rand)
+               app_RAND_load_file(NULL, bio_err, 0);
+
        ERR_load_crypto_strings();
-       X509v3_add_netscape_extensions();
+
+       if (!app_passwd(bio_err, passargin, NULL, &passin, NULL))
+               {
+               BIO_printf(bio_err, "Error getting password\n");
+               goto end;
+               }
 
        if (!X509_STORE_set_default_paths(ctx))
                {
@@ -313,6 +555,13 @@ bad:
                goto end;
                }
 
+       if (fkeyfile)
+               {
+               fkey = load_pubkey(bio_err, fkeyfile, keyformat, 0,
+                                               NULL, e, "Forced key");
+               if (fkey == NULL) goto end;
+               }
+
        if ((CAkeyfile == NULL) && (CA_flag) && (CAformat == FORMAT_PEM))
                { CAkeyfile=CAfile; }
        else if ((CA_flag) && (CAkeyfile == NULL))
@@ -321,10 +570,48 @@ bad:
                goto end;
                }
 
+       if (extfile)
+               {
+               long errorline = -1;
+               X509V3_CTX ctx2;
+               extconf = NCONF_new(NULL);
+               if (!NCONF_load(extconf, extfile,&errorline))
+                       {
+                       if (errorline <= 0)
+                               BIO_printf(bio_err,
+                                       "error loading the config file '%s'\n",
+                                                               extfile);
+                       else
+                               BIO_printf(bio_err,
+                                      "error on line %ld of config file '%s'\n"
+                                                       ,errorline,extfile);
+                       goto end;
+                       }
+               if (!extsect)
+                       {
+                       extsect = NCONF_get_string(extconf, "default", "extensions");
+                       if (!extsect)
+                               {
+                               ERR_clear_error();
+                               extsect = "default";
+                               }
+                       }
+               X509V3_set_ctx_test(&ctx2);
+               X509V3_set_nconf(&ctx2, extconf);
+               if (!X509V3_EXT_add_nconf(extconf, &ctx2, extsect, NULL))
+                       {
+                       BIO_printf(bio_err,
+                               "Error Loading extension section %s\n",
+                                                                extsect);
+                       ERR_print_errors(bio_err);
+                       goto end;
+                       }
+               }
+
+
        if (reqfile)
                {
                EVP_PKEY *pkey;
-               X509_CINF *ci;
                BIO *in;
 
                if (!sign_flag && !CA_flag)
@@ -346,13 +633,18 @@ bad:
                        if (BIO_read_filename(in,infile) <= 0)
                                {
                                perror(infile);
+                               BIO_free(in);
                                goto end;
                                }
                        }
-               req=PEM_read_bio_X509_REQ(in,NULL,NULL);
+               req=PEM_read_bio_X509_REQ(in,NULL,NULL,NULL);
                BIO_free(in);
 
-               if (req == NULL) { perror(infile); goto end; }
+               if (req == NULL)
+                       {
+                       ERR_print_errors(bio_err);
+                       goto end;
+                       }
 
                if (    (req->req_info == NULL) ||
                        (req->req_info->pubkey == NULL) ||
@@ -383,41 +675,49 @@ bad:
                        }
                else
                        BIO_printf(bio_err,"Signature ok\n");
-               
-               X509_NAME_oneline(req->req_info->subject,buf,256);
-               BIO_printf(bio_err,"subject=%s\n",buf);
+
+               print_name(bio_err, "subject=", X509_REQ_get_subject_name(req), nmflag);
 
                if ((x=X509_new()) == NULL) goto end;
-               ci=x->cert_info;
 
-               if (!ASN1_INTEGER_set(X509_get_serialNumber(x),0)) goto end;
+               if (sno == NULL)
+                       {
+                       sno = ASN1_INTEGER_new();
+                       if (!sno || !rand_serial(NULL, sno))
+                               goto end;
+                       if (!X509_set_serialNumber(x, sno)) 
+                               goto end;
+                       ASN1_INTEGER_free(sno);
+                       sno = NULL;
+                       }
+               else if (!X509_set_serialNumber(x, sno)) 
+                       goto end;
+
                if (!X509_set_issuer_name(x,req->req_info->subject)) goto end;
                if (!X509_set_subject_name(x,req->req_info->subject)) goto end;
 
                X509_gmtime_adj(X509_get_notBefore(x),0);
-               X509_gmtime_adj(X509_get_notAfter(x),(long)60*60*24*days);
-
-#if 0
-               X509_PUBKEY_free(ci->key);
-               ci->key=req->req_info->pubkey;
-               req->req_info->pubkey=NULL;
-#else
-               pkey = X509_REQ_get_pubkey(req);
-               X509_set_pubkey(x,pkey);
-               EVP_PKEY_free(pkey);
-#endif
+               X509_time_adj_ex(X509_get_notAfter(x),days, 0, NULL);
+               if (fkey)
+                       X509_set_pubkey(x, fkey);
+               else
+                       {
+                       pkey = X509_REQ_get_pubkey(req);
+                       X509_set_pubkey(x,pkey);
+                       EVP_PKEY_free(pkey);
+                       }
                }
        else
-               x=load_cert(infile,informat);
+               x=load_cert(bio_err,infile,informat,NULL,e,"Certificate");
 
        if (x == NULL) goto end;
        if (CA_flag)
                {
-               xca=load_cert(CAfile,CAformat);
+               xca=load_cert(bio_err,CAfile,CAformat,NULL,e,"CA Certificate");
                if (xca == NULL) goto end;
                }
 
-       if (!noout || text)
+       if (!noout || text || next_serial)
                {
                OBJ_create("2.99999.3",
                        "SET.ex3","SET x509v3 extension 3");
@@ -429,7 +729,15 @@ bad:
                        goto end;
                        }
                if (outfile == NULL)
+                       {
                        BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+                       {
+                       BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                       out = BIO_push(tmpbio, out);
+                       }
+#endif
+                       }
                else
                        {
                        if (BIO_write_filename(out,outfile) <= 0)
@@ -440,34 +748,120 @@ bad:
                        }
                }
 
+       if (alias) X509_alias_set1(x, (unsigned char *)alias, -1);
+
+       if (clrtrust) X509_trust_clear(x);
+       if (clrreject) X509_reject_clear(x);
+
+       if (trust)
+               {
+               for (i = 0; i < sk_ASN1_OBJECT_num(trust); i++)
+                       {
+                       objtmp = sk_ASN1_OBJECT_value(trust, i);
+                       X509_add1_trust_object(x, objtmp);
+                       }
+               }
+
+       if (reject)
+               {
+               for (i = 0; i < sk_ASN1_OBJECT_num(reject); i++)
+                       {
+                       objtmp = sk_ASN1_OBJECT_value(reject, i);
+                       X509_add1_reject_object(x, objtmp);
+                       }
+               }
+
        if (num)
                {
                for (i=1; i<=num; i++)
                        {
                        if (issuer == i)
                                {
-                               X509_NAME_oneline(X509_get_issuer_name(x),
-                                       buf,256);
-                               BIO_printf(STDout,"issuer= %s\n",buf);
+                               print_name(STDout, "issuer= ",
+                                       X509_get_issuer_name(x), nmflag);
                                }
                        else if (subject == i) 
                                {
-                               X509_NAME_oneline(X509_get_subject_name(x),
-                                       buf,256);
-                               BIO_printf(STDout,"subject=%s\n",buf);
+                               print_name(STDout, "subject= ",
+                                       X509_get_subject_name(x), nmflag);
                                }
                        else if (serial == i)
                                {
                                BIO_printf(STDout,"serial=");
-                               i2a_ASN1_INTEGER(STDout,x->cert_info->serialNumber);
+                               i2a_ASN1_INTEGER(STDout,
+                                       X509_get_serialNumber(x));
                                BIO_printf(STDout,"\n");
                                }
-                       else if (hash == i)
+                       else if (next_serial == i)
+                               {
+                               BIGNUM *bnser;
+                               ASN1_INTEGER *ser;
+                               ser = X509_get_serialNumber(x);
+                               bnser = ASN1_INTEGER_to_BN(ser, NULL);
+                               if (!bnser)
+                                       goto end;
+                               if (!BN_add_word(bnser, 1))
+                                       goto end;
+                               ser = BN_to_ASN1_INTEGER(bnser, NULL);
+                               if (!ser)
+                                       goto end;
+                               BN_free(bnser);
+                               i2a_ASN1_INTEGER(out, ser);
+                               ASN1_INTEGER_free(ser);
+                               BIO_puts(out, "\n");
+                               }
+                       else if ((email == i) || (ocsp_uri == i))
+                               {
+                               int j;
+                               STACK_OF(OPENSSL_STRING) *emlst;
+                               if (email == i)
+                                       emlst = X509_get1_email(x);
+                               else
+                                       emlst = X509_get1_ocsp(x);
+                               for (j = 0; j < sk_OPENSSL_STRING_num(emlst); j++)
+                                       BIO_printf(STDout, "%s\n",
+                                                  sk_OPENSSL_STRING_value(emlst, j));
+                               X509_email_free(emlst);
+                               }
+                       else if (aliasout == i)
+                               {
+                               unsigned char *alstr;
+                               alstr = X509_alias_get0(x, NULL);
+                               if (alstr) BIO_printf(STDout,"%s\n", alstr);
+                               else BIO_puts(STDout,"<No Alias>\n");
+                               }
+                       else if (subject_hash == i)
                                {
                                BIO_printf(STDout,"%08lx\n",X509_subject_name_hash(x));
                                }
+#ifndef OPENSSL_NO_MD5
+                       else if (subject_hash_old == i)
+                               {
+                               BIO_printf(STDout,"%08lx\n",X509_subject_name_hash_old(x));
+                               }
+#endif
+                       else if (issuer_hash == i)
+                               {
+                               BIO_printf(STDout,"%08lx\n",X509_issuer_name_hash(x));
+                               }
+#ifndef OPENSSL_NO_MD5
+                       else if (issuer_hash_old == i)
+                               {
+                               BIO_printf(STDout,"%08lx\n",X509_issuer_name_hash_old(x));
+                               }
+#endif
+                       else if (pprint == i)
+                               {
+                               X509_PURPOSE *ptmp;
+                               int j;
+                               BIO_printf(STDout, "Certificate purposes:\n");
+                               for (j = 0; j < X509_PURPOSE_get_count(); j++)
+                                       {
+                                       ptmp = X509_PURPOSE_get0(j);
+                                       purpose_print(STDout, x, ptmp);
+                                       }
+                               }
                        else
-#ifndef NO_RSA
                                if (modulus == i)
                                {
                                EVP_PKEY *pkey;
@@ -480,15 +874,36 @@ bad:
                                        goto end;
                                        }
                                BIO_printf(STDout,"Modulus=");
+#ifndef OPENSSL_NO_RSA
                                if (pkey->type == EVP_PKEY_RSA)
                                        BN_print(STDout,pkey->pkey.rsa->n);
                                else
+#endif
+#ifndef OPENSSL_NO_DSA
+                               if (pkey->type == EVP_PKEY_DSA)
+                                       BN_print(STDout,pkey->pkey.dsa->pub_key);
+                               else
+#endif
                                        BIO_printf(STDout,"Wrong Algorithm type");
                                BIO_printf(STDout,"\n");
                                EVP_PKEY_free(pkey);
                                }
                        else
-#endif
+                               if (pubkey == i)
+                               {
+                               EVP_PKEY *pkey;
+
+                               pkey=X509_get_pubkey(x);
+                               if (pkey == NULL)
+                                       {
+                                       BIO_printf(bio_err,"Error getting public key\n");
+                                       ERR_print_errors(bio_err);
+                                       goto end;
+                                       }
+                               PEM_write_bio_PUBKEY(STDout, pkey);
+                               EVP_PKEY_free(pkey);
+                               }
+                       else
                                if (C == i)
                                {
                                unsigned char *d;
@@ -496,14 +911,15 @@ bad:
                                int y,z;
 
                                X509_NAME_oneline(X509_get_subject_name(x),
-                                       buf,256);
+                                       buf,sizeof buf);
                                BIO_printf(STDout,"/* subject:%s */\n",buf);
                                m=X509_NAME_oneline(
-                                       X509_get_issuer_name(x),buf,256);
+                                       X509_get_issuer_name(x),buf,
+                                       sizeof buf);
                                BIO_printf(STDout,"/* issuer :%s */\n",buf);
 
                                z=i2d_X509(x,NULL);
-                               m=Malloc(z);
+                               m=OPENSSL_malloc(z);
 
                                d=(unsigned char *)m;
                                z=i2d_X509_NAME(X509_get_subject_name(x),&d);
@@ -541,11 +957,11 @@ bad:
                                if (y%16 != 0) BIO_printf(STDout,"\n");
                                BIO_printf(STDout,"};\n");
 
-                               Free(m);
+                               OPENSSL_free(m);
                                }
                        else if (text == i)
                                {
-                               X509_print(out,x);
+                               X509_print_ex(STDout,x,nmflag, certflag);
                                }
                        else if (startdate == i)
                                {
@@ -564,13 +980,18 @@ bad:
                                int j;
                                unsigned int n;
                                unsigned char md[EVP_MAX_MD_SIZE];
+                               const EVP_MD *fdig = digest;
 
-                               if (!X509_digest(x,EVP_md5(),md,&n))
+                               if (!fdig)
+                                       fdig = EVP_sha1();
+
+                               if (!X509_digest(x,fdig,md,&n))
                                        {
                                        BIO_printf(bio_err,"out of memory\n");
                                        goto end;
                                        }
-                               BIO_printf(STDout,"MD5 Fingerprint=");
+                               BIO_printf(STDout,"%s Fingerprint=",
+                                               OBJ_nid2sn(EVP_MD_type(fdig)));
                                for (j=0; j<(int)n; j++)
                                        {
                                        BIO_printf(STDout,"%02X%c",md[j],
@@ -585,32 +1006,33 @@ bad:
                                BIO_printf(bio_err,"Getting Private key\n");
                                if (Upkey == NULL)
                                        {
-                                       Upkey=load_key(keyfile,keyformat);
+                                       Upkey=load_key(bio_err,
+                                               keyfile, keyformat, 0,
+                                               passin, e, "Private key");
                                        if (Upkey == NULL) goto end;
                                        }
-#ifndef NO_DSA
-                               if (Upkey->type == EVP_PKEY_DSA)
-                                       digest=EVP_dss1();
-#endif
 
-                               if (!sign(x,Upkey,days,digest)) goto end;
+                               assert(need_rand);
+                               if (!sign(x,Upkey,days,clrext,digest,
+                                                extconf, extsect)) goto end;
                                }
                        else if (CA_flag == i)
                                {
                                BIO_printf(bio_err,"Getting CA Private Key\n");
                                if (CAkeyfile != NULL)
                                        {
-                                       CApkey=load_key(CAkeyfile,CAkeyformat);
+                                       CApkey=load_key(bio_err,
+                                               CAkeyfile, CAkeyformat,
+                                               0, passin, e,
+                                               "CA Private Key");
                                        if (CApkey == NULL) goto end;
                                        }
-#ifndef NO_DSA
-                               if (CApkey->type == EVP_PKEY_DSA)
-                                       digest=EVP_dss1();
-#endif
                                
+                               assert(need_rand);
                                if (!x509_certify(ctx,CAfile,digest,x,xca,
-                                       CApkey,
-                                       CAserial,CA_createserial,days))
+                                       CApkey, sigopts,
+                                       CAserial,CA_createserial,days, clrext,
+                                       extconf, extsect, sno))
                                        goto end;
                                }
                        else if (x509req == i)
@@ -625,13 +1047,15 @@ bad:
                                        }
                                else
                                        {
-                                       pk=load_key(keyfile,FORMAT_PEM);
+                                       pk=load_key(bio_err,
+                                               keyfile, keyformat, 0,
+                                               passin, e, "request key");
                                        if (pk == NULL) goto end;
                                        }
 
                                BIO_printf(bio_err,"Generating certificate request\n");
 
-                               rq=X509_to_X509_REQ(x,pk,EVP_md5());
+                               rq=X509_to_X509_REQ(x,pk,digest);
                                EVP_PKEY_free(pk);
                                if (rq == NULL)
                                        {
@@ -645,170 +1069,168 @@ bad:
                                        }
                                noout=1;
                                }
+                       else if (ocspid == i)
+                               {
+                               X509_ocspid_print(out, x);
+                               }
                        }
                }
 
+       if (checkend)
+               {
+               time_t tcheck=time(NULL) + checkoffset;
+
+               if (X509_cmp_time(X509_get_notAfter(x), &tcheck) < 0)
+                       {
+                       BIO_printf(out,"Certificate will expire\n");
+                       ret=1;
+                       }
+               else
+                       {
+                       BIO_printf(out,"Certificate will not expire\n");
+                       ret=0;
+                       }
+               goto end;
+               }
+
+       print_cert_checks(STDout, x, checkhost, checkemail, checkip);
+
        if (noout)
                {
                ret=0;
                goto end;
                }
 
+       if (badsig)
+               x->signature->data[x->signature->length - 1] ^= 0x1;
+
        if      (outformat == FORMAT_ASN1)
                i=i2d_X509_bio(out,x);
        else if (outformat == FORMAT_PEM)
-               i=PEM_write_bio_X509(out,x);
+               {
+               if (trustout) i=PEM_write_bio_X509_AUX(out,x);
+               else i=PEM_write_bio_X509(out,x);
+               }
        else if (outformat == FORMAT_NETSCAPE)
                {
-               ASN1_HEADER ah;
-               ASN1_OCTET_STRING os;
+               NETSCAPE_X509 nx;
+               ASN1_OCTET_STRING hdr;
 
-               os.data=(unsigned char *)CERT_HDR;
-               os.length=strlen(CERT_HDR);
-               ah.header= &os;
-               ah.data=(char *)x;
-               ah.meth=X509_asn1_meth();
+               hdr.data=(unsigned char *)NETSCAPE_CERT_HDR;
+               hdr.length=strlen(NETSCAPE_CERT_HDR);
+               nx.header= &hdr;
+               nx.cert=x;
 
-               /* no macro for this one yet */
-               i=ASN1_i2d_bio(i2d_ASN1_HEADER,out,(unsigned char *)&ah);
+               i=ASN1_item_i2d_bio(ASN1_ITEM_rptr(NETSCAPE_X509),out,&nx);
                }
        else    {
                BIO_printf(bio_err,"bad output format specified for outfile\n");
                goto end;
                }
-       if (!i) {
+       if (!i)
+               {
                BIO_printf(bio_err,"unable to write certificate\n");
                ERR_print_errors(bio_err);
                goto end;
                }
        ret=0;
 end:
+       if (need_rand)
+               app_RAND_write_file(NULL, bio_err);
        OBJ_cleanup();
-       if (out != NULL) BIO_free(out);
-       if (STDout != NULL) BIO_free(STDout);
-       if (ctx != NULL) X509_STORE_free(ctx);
-       if (req != NULL) X509_REQ_free(req);
-       if (x != NULL) X509_free(x);
-       if (xca != NULL) X509_free(xca);
-       if (Upkey != NULL) EVP_PKEY_free(Upkey);
-       if (CApkey != NULL) EVP_PKEY_free(CApkey);
-       if (rq != NULL) X509_REQ_free(rq);
-       X509v3_cleanup_extensions();
-       EXIT(ret);
+       NCONF_free(extconf);
+       BIO_free_all(out);
+       BIO_free_all(STDout);
+       X509_STORE_free(ctx);
+       X509_REQ_free(req);
+       X509_free(x);
+       X509_free(xca);
+       EVP_PKEY_free(Upkey);
+       EVP_PKEY_free(CApkey);
+       EVP_PKEY_free(fkey);
+       if (sigopts)
+               sk_OPENSSL_STRING_free(sigopts);
+       X509_REQ_free(rq);
+       ASN1_INTEGER_free(sno);
+       sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free);
+       sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free);
+       if (passin) OPENSSL_free(passin);
+       apps_shutdown();
+       OPENSSL_EXIT(ret);
        }
 
-static int x509_certify(ctx,CAfile,digest,x,xca,pkey,serialfile,create,days)
-X509_STORE *ctx;
-char *CAfile;
-EVP_MD *digest;
-X509 *x;
-X509 *xca;
-EVP_PKEY *pkey;
-char *serialfile;
-int create;
-int days;
+static ASN1_INTEGER *x509_load_serial(char *CAfile, char *serialfile, int create)
        {
-       int ret=0;
-       BIO *io=NULL;
-       MS_STATIC char buf2[1024];
-       char *buf=NULL,*p;
-       BIGNUM *serial=NULL;
-       ASN1_INTEGER *bs=NULL,bs2;
-       X509_STORE_CTX xsc;
-       EVP_PKEY *upkey;
-
-       upkey = X509_get_pubkey(xca);
-       EVP_PKEY_copy_parameters(upkey,pkey);
-       EVP_PKEY_free(upkey);
-
-       X509_STORE_CTX_init(&xsc,ctx,x,NULL);
-       buf=(char *)Malloc(EVP_PKEY_size(pkey)*2+
-               ((serialfile == NULL)
-                       ?(strlen(CAfile)+strlen(POSTFIX)+1)
-                       :(strlen(serialfile)))+1);
+       char *buf = NULL, *p;
+       ASN1_INTEGER *bs = NULL;
+       BIGNUM *serial = NULL;
+       size_t len;
+
+       len = ((serialfile == NULL)
+               ?(strlen(CAfile)+strlen(POSTFIX)+1)
+               :(strlen(serialfile)))+1;
+       buf=OPENSSL_malloc(len);
        if (buf == NULL) { BIO_printf(bio_err,"out of mem\n"); goto end; }
        if (serialfile == NULL)
                {
-               strcpy(buf,CAfile);
+               BUF_strlcpy(buf,CAfile,len);
                for (p=buf; *p; p++)
                        if (*p == '.')
                                {
                                *p='\0';
                                break;
                                }
-               strcat(buf,POSTFIX);
+               BUF_strlcat(buf,POSTFIX,len);
                }
        else
-               strcpy(buf,serialfile);
-       serial=BN_new();
-       bs=ASN1_INTEGER_new();
-       if ((serial == NULL) || (bs == NULL))
-               {
-               ERR_print_errors(bio_err);
-               goto end;
-               }
+               BUF_strlcpy(buf,serialfile,len);
 
-       io=BIO_new(BIO_s_file());
-       if (io == NULL)
-               {
-               ERR_print_errors(bio_err);
-               goto end;
-               }
-       
-       if (BIO_read_filename(io,buf) <= 0)
-               {
-               if (!create)
-                       {
-                       perror(buf);
-                       goto end;
-                       }
-               else
-                       {
-                       ASN1_INTEGER_set(bs,0);
-                       BN_zero(serial);
-                       }
-               }
-       else 
-               {
-               if (!a2i_ASN1_INTEGER(io,bs,buf2,1024))
-                       {
-                       BIO_printf(bio_err,"unable to load serial number from %s\n",buf);
-                       ERR_print_errors(bio_err);
-                       goto end;
-                       }
-               else
-                       {
-                       serial=BN_bin2bn(bs->data,bs->length,serial);
-                       if (serial == NULL)
-                               {
-                               BIO_printf(bio_err,"error converting bin 2 bn");
-                               goto end;
-                               }
-                       }
-               }
+       serial = load_serial(buf, create, NULL);
+       if (serial == NULL) goto end;
 
        if (!BN_add_word(serial,1))
                { BIO_printf(bio_err,"add_word failure\n"); goto end; }
-       bs2.data=(unsigned char *)buf2;
-       bs2.length=BN_bn2bin(serial,bs2.data);
 
-       if (BIO_write_filename(io,buf) <= 0)
+       if (!save_serial(buf, NULL, serial, &bs)) goto end;
+
+ end:
+       if (buf) OPENSSL_free(buf);
+       BN_free(serial);
+       return bs;
+       }
+
+static int x509_certify(X509_STORE *ctx, char *CAfile, const EVP_MD *digest,
+                       X509 *x, X509 *xca, EVP_PKEY *pkey,
+                       STACK_OF(OPENSSL_STRING) *sigopts,
+                       char *serialfile, int create,
+                       int days, int clrext, CONF *conf, char *section,
+                       ASN1_INTEGER *sno)
+       {
+       int ret=0;
+       ASN1_INTEGER *bs=NULL;
+       X509_STORE_CTX xsc;
+       EVP_PKEY *upkey;
+
+       upkey = X509_get_pubkey(xca);
+       EVP_PKEY_copy_parameters(upkey,pkey);
+       EVP_PKEY_free(upkey);
+
+       if(!X509_STORE_CTX_init(&xsc,ctx,x,NULL))
                {
-               BIO_printf(bio_err,"error attempting to write serial number file\n");
-               perror(buf);
+               BIO_printf(bio_err,"Error initialising X509 store\n");
                goto end;
                }
-       i2a_ASN1_INTEGER(io,&bs2);
-       BIO_puts(io,"\n");
-       BIO_free(io);
-       io=NULL;
-       
-       if (!X509_STORE_add_cert(ctx,x)) goto end;
+       if (sno) bs = sno;
+       else if (!(bs = x509_load_serial(CAfile, serialfile, create)))
+               goto end;
+
+/*     if (!X509_STORE_add_cert(ctx,x)) goto end;*/
 
        /* NOTE: this certificate can/should be self signed, unless it was
         * a certificate request in which case it is not. */
        X509_STORE_CTX_set_cert(&xsc,x);
-       if (!reqfile && !X509_verify_cert(&xsc))
+       X509_STORE_CTX_set_flags(&xsc, X509_V_FLAG_CHECK_SS_SIGNATURE);
+       if (!reqfile && X509_verify_cert(&xsc) <= 0)
                goto end;
 
        if (!X509_check_private_key(xca,pkey))
@@ -824,39 +1246,40 @@ int days;
                goto end;
 
        /* hardwired expired */
-       if (X509_gmtime_adj(X509_get_notAfter(x),(long)60*60*24*days) == NULL)
+       if (X509_time_adj_ex(X509_get_notAfter(x),days, 0, NULL) == NULL)
                goto end;
 
-       /* don't save DSA parameters in child if parent has them
-        * and the parents and the childs are the same. */
-       upkey=X509_get_pubkey(x);
-       if (!EVP_PKEY_missing_parameters(pkey) &&
-               (EVP_PKEY_cmp_parameters(pkey,upkey) == 0))
+       if (clrext)
                {
-               EVP_PKEY_save_parameters(upkey,0);
-               /* Force a re-write */
-               X509_set_pubkey(x,upkey);
+               while (X509_get_ext_count(x) > 0) X509_delete_ext(x, 0);
                }
-       EVP_PKEY_free(upkey);
 
-       if (!X509_sign(x,pkey,digest)) goto end;
+       if (conf)
+               {
+               X509V3_CTX ctx2;
+#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL
+               X509_set_version(x, force_version);
+#else
+               X509_set_version(x,2); /* version 3 certificate */
+#endif
+                X509V3_set_ctx(&ctx2, xca, x, NULL, NULL, 0);
+                X509V3_set_nconf(&ctx2, conf);
+                if (!X509V3_EXT_add_nconf(conf, &ctx2, section, x)) goto end;
+               }
+
+       if (!do_X509_sign(bio_err, x, pkey, digest, sigopts))
+               goto end;
        ret=1;
 end:
        X509_STORE_CTX_cleanup(&xsc);
        if (!ret)
                ERR_print_errors(bio_err);
-       if (buf != NULL) Free(buf);
-       if (bs != NULL) ASN1_INTEGER_free(bs);
-       if (io != NULL) BIO_free(io);
-       if (serial != NULL) BN_free(serial);
-       return(ret);
+       if (!sno) ASN1_INTEGER_free(bs);
+       return ret;
        }
 
-static int MS_CALLBACK callb(ok, ctx)
-int ok;
-X509_STORE_CTX *ctx;
+static int MS_CALLBACK callb(int ok, X509_STORE_CTX *ctx)
        {
-       char buf[256];
        int err;
        X509 *err_cert;
 
@@ -865,7 +1288,7 @@ X509_STORE_CTX *ctx;
         * final ok == 1 calls to this function */
        err=X509_STORE_CTX_get_error(ctx);
        if (err == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT)
-               return(1);
+               return 1;
 
        /* BAD we should have gotten an error.  Normally if everything
         * worked X509_STORE_CTX_get_error(ctx) will still be set to
@@ -873,169 +1296,22 @@ X509_STORE_CTX *ctx;
        if (ok)
                {
                BIO_printf(bio_err,"error with certificate to be certified - should be self signed\n");
-               return(0);
+               return 0;
                }
        else
                {
                err_cert=X509_STORE_CTX_get_current_cert(ctx);
-               X509_NAME_oneline(X509_get_subject_name(err_cert),buf,256);
-               BIO_printf(bio_err,"%s\n",buf);
+               print_name(bio_err, NULL, X509_get_subject_name(err_cert),0);
                BIO_printf(bio_err,"error with certificate - error %d at depth %d\n%s\n",
                        err,X509_STORE_CTX_get_error_depth(ctx),
                        X509_verify_cert_error_string(err));
-               return(1);
+               return 1;
                }
        }
 
-static EVP_PKEY *load_key(file, format)
-char *file;
-int format;
-       {
-       BIO *key=NULL;
-       EVP_PKEY *pkey=NULL;
-
-       if (file == NULL)
-               {
-               BIO_printf(bio_err,"no keyfile specified\n");
-               goto end;
-               }
-       key=BIO_new(BIO_s_file());
-       if (key == NULL)
-               {
-               ERR_print_errors(bio_err);
-               goto end;
-               }
-       if (BIO_read_filename(key,file) <= 0)
-               {
-               perror(file);
-               goto end;
-               }
-#ifndef NO_RSA
-       if      (format == FORMAT_ASN1)
-               {
-               RSA *rsa;
-
-               rsa=d2i_RSAPrivateKey_bio(key,NULL);
-               if (rsa != NULL)
-                       {
-                       if ((pkey=EVP_PKEY_new()) != NULL)
-                               EVP_PKEY_assign_RSA(pkey,rsa);
-                       else
-                               RSA_free(rsa);
-                       }
-               }
-       else
-#endif
-               if (format == FORMAT_PEM)
-               {
-               pkey=PEM_read_bio_PrivateKey(key,NULL,NULL);
-               }
-       else
-               {
-               BIO_printf(bio_err,"bad input format specified for key\n");
-               goto end;
-               }
-end:
-       if (key != NULL) BIO_free(key);
-       if (pkey == NULL)
-               BIO_printf(bio_err,"unable to load Private Key\n");
-       return(pkey);
-       }
-
-static X509 *load_cert(file, format)
-char *file;
-int format;
-       {
-       ASN1_HEADER *ah=NULL;
-       BUF_MEM *buf=NULL;
-       X509 *x=NULL;
-       BIO *cert;
-
-       if ((cert=BIO_new(BIO_s_file())) == NULL)
-               {
-               ERR_print_errors(bio_err);
-               goto end;
-               }
-
-       if (file == NULL)
-               BIO_set_fp(cert,stdin,BIO_NOCLOSE);
-       else
-               {
-               if (BIO_read_filename(cert,file) <= 0)
-                       {
-                       perror(file);
-                       goto end;
-                       }
-               }
-       if      (format == FORMAT_ASN1)
-               x=d2i_X509_bio(cert,NULL);
-       else if (format == FORMAT_NETSCAPE)
-               {
-               unsigned char *p,*op;
-               int size=0,i;
-
-               /* We sort of have to do it this way because it is sort of nice
-                * to read the header first and check it, then
-                * try to read the certificate */
-               buf=BUF_MEM_new();
-               for (;;)
-                       {
-                       if ((buf == NULL) || (!BUF_MEM_grow(buf,size+1024*10)))
-                               goto end;
-                       i=BIO_read(cert,&(buf->data[size]),1024*10);
-                       size+=i;
-                       if (i == 0) break;
-                       if (i < 0)
-                               {
-                               perror("reading certificate");
-                               goto end;
-                               }
-                       }
-               p=(unsigned char *)buf->data;
-               op=p;
-
-               /* First load the header */
-               if ((ah=d2i_ASN1_HEADER(NULL,&p,(long)size)) == NULL)
-                       goto end;
-               if ((ah->header == NULL) || (ah->header->data == NULL) ||
-                       (strncmp(CERT_HDR,(char *)ah->header->data,
-                       ah->header->length) != 0))
-                       {
-                       BIO_printf(bio_err,"Error reading header on certificate\n");
-                       goto end;
-                       }
-               /* header is ok, so now read the object */
-               p=op;
-               ah->meth=X509_asn1_meth();
-               if ((ah=d2i_ASN1_HEADER(&ah,&p,(long)size)) == NULL)
-                       goto end;
-               x=(X509 *)ah->data;
-               ah->data=NULL;
-               }
-       else if (format == FORMAT_PEM)
-               x=PEM_read_bio_X509(cert,NULL,NULL);
-       else    {
-               BIO_printf(bio_err,"bad input format specified for input cert\n");
-               goto end;
-               }
-end:
-       if (x == NULL)
-               {
-               BIO_printf(bio_err,"unable to load certificate\n");
-               ERR_print_errors(bio_err);
-               }
-       if (ah != NULL) ASN1_HEADER_free(ah);
-       if (cert != NULL) BIO_free(cert);
-       if (buf != NULL) BUF_MEM_free(buf);
-       return(x);
-       }
-
 /* self sign */
-static int sign(x, pkey, days, digest)
-X509 *x;
-EVP_PKEY *pkey;
-int days;
-EVP_MD *digest;
+static int sign(X509 *x, EVP_PKEY *pkey, int days, int clrext, const EVP_MD *digest, 
+                                               CONF *conf, char *section)
        {
 
        EVP_PKEY *pktmp;
@@ -1056,9 +1332,42 @@ EVP_MD *digest;
                goto err;
 
        if (!X509_set_pubkey(x,pkey)) goto err;
+       if (clrext)
+               {
+               while (X509_get_ext_count(x) > 0) X509_delete_ext(x, 0);
+               }
+       if (conf)
+               {
+               X509V3_CTX ctx;
+#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL
+               X509_set_version(x, force_version);
+#else
+               X509_set_version(x,2); /* version 3 certificate */
+#endif
+                X509V3_set_ctx(&ctx, x, x, NULL, NULL, 0);
+                X509V3_set_nconf(&ctx, conf);
+                if (!X509V3_EXT_add_nconf(conf, &ctx, section, x)) goto err;
+               }
        if (!X509_sign(x,pkey,digest)) goto err;
-       return(1);
+       return 1;
 err:
        ERR_print_errors(bio_err);
-       return(0);
+       return 0;
        }
+
+static int purpose_print(BIO *bio, X509 *cert, X509_PURPOSE *pt)
+{
+       int id, i, idret;
+       char *pname;
+       id = X509_PURPOSE_get_id(pt);
+       pname = X509_PURPOSE_get0_name(pt);
+       for (i = 0; i < 2; i++)
+               {
+               idret = X509_check_purpose(cert, id, i);
+               BIO_printf(bio, "%s%s : ", pname, i ? " CA" : ""); 
+               if (idret == 1) BIO_printf(bio, "Yes\n");
+               else if (idret == 0) BIO_printf(bio, "No\n");
+               else BIO_printf(bio, "Yes (WARNING code=%d)\n", idret);
+               }
+       return 1;
+}