Reset the version number of the issuer certificate? I believe this
[openssl.git] / apps / ca.c
index c413a0318f393be2c50920950a1bd51dfdfe59ba..0f65506d75caec0961c7fc236635fb5fd72152c0 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
 
 #define ENV_DATABASE           "database"
 
-#define DB_type         0
-#define DB_exp_date     1
-#define DB_rev_date     2
-#define DB_serial       3       /* index - unique */
-#define DB_file         4       
-#define DB_name         5       /* index - unique for active */
-#define DB_NUMBER       6
-
-#define DB_TYPE_REV    'R'
-#define DB_TYPE_EXP    'E'
-#define DB_TYPE_VAL    'V'
-
 /* Additional revocation information types */
 
 #define REV_NONE               0       /* No addditional information */
@@ -196,7 +184,9 @@ static char *ca_usage[]={
 " -extensions ..  - Extension section (override value in config file)\n",
 " -extfile file   - Configuration file with X509v3 extentions to add\n",
 " -crlexts ..     - CRL extension section (override value in config file)\n",
+#ifndef OPENSSL_NO_ENGINE
 " -engine e       - use engine e, possibly a hardware device.\n",
+#endif
 " -status serial  - Shows certificate status given the serial number\n",
 " -updatedb       - Updates db for expired certificates\n",
 NULL
@@ -209,43 +199,36 @@ extern int EF_ALIGNMENT;
 #endif
 
 static void lookup_fail(char *name,char *tag);
-static unsigned long index_serial_hash(const char **a);
-static int index_serial_cmp(const char **a, const char **b);
-static unsigned long index_name_hash(const char **a);
-static int index_name_qual(char **a);
-static int index_name_cmp(const char **a,const char **b);
-static BIGNUM *load_serial(char *serialfile);
-static int save_serial(char *serialfile, BIGNUM *serial);
 static int certify(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
-                  const EVP_MD *dgst,STACK_OF(CONF_VALUE) *policy,TXT_DB *db,
+                  const EVP_MD *dgst,STACK_OF(CONF_VALUE) *policy,CA_DB *db,
                   BIGNUM *serial, char *subj, int email_dn, char *startdate,
                   char *enddate, long days, int batch, char *ext_sect, CONF *conf,
                   int verbose, unsigned long certopt, unsigned long nameopt,
                   int default_op, int ext_copy);
 static int certify_cert(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
                        const EVP_MD *dgst,STACK_OF(CONF_VALUE) *policy,
-                       TXT_DB *db, BIGNUM *serial, char *subj, int email_dn,
+                       CA_DB *db, BIGNUM *serial, char *subj, int email_dn,
                        char *startdate, char *enddate, long days, int batch,
                        char *ext_sect, CONF *conf,int verbose, unsigned long certopt,
                        unsigned long nameopt, int default_op, int ext_copy,
                        ENGINE *e);
 static int certify_spkac(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
                         const EVP_MD *dgst,STACK_OF(CONF_VALUE) *policy,
-                        TXT_DB *db, BIGNUM *serial,char *subj, int email_dn,
+                        CA_DB *db, BIGNUM *serial,char *subj, int email_dn,
                         char *startdate, char *enddate, long days, char *ext_sect,
                         CONF *conf, int verbose, unsigned long certopt, 
                         unsigned long nameopt, int default_op, int ext_copy);
 static int fix_data(int nid, int *type);
 static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext);
 static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
-       STACK_OF(CONF_VALUE) *policy, TXT_DB *db, BIGNUM *serial,char *subj,
+       STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial,char *subj,
        int email_dn, char *startdate, char *enddate, long days, int batch,
                int verbose, X509_REQ *req, char *ext_sect, CONF *conf,
        unsigned long certopt, unsigned long nameopt, int default_op,
        int ext_copy);
-static int do_revoke(X509 *x509, TXT_DB *db, int ext, char *extval);
-static int get_certificate_status(const char *ser_status, TXT_DB *db);
-static int do_updatedb(TXT_DB *db);
+static int do_revoke(X509 *x509, CA_DB *db, int ext, char *extval);
+static int get_certificate_status(const char *ser_status, CA_DB *db);
+static int do_updatedb(CA_DB *db);
 static int check_time_format(char *str);
 char *make_revocation_str(int rev_type, char *rev_arg);
 int make_revoked(X509_REVOKED *rev, char *str);
@@ -257,11 +240,6 @@ static char *section=NULL;
 static int preserve=0;
 static int msie_hack=0;
 
-static IMPLEMENT_LHASH_HASH_FN(index_serial_hash,const char **)
-static IMPLEMENT_LHASH_COMP_FN(index_serial_cmp,const char **)
-static IMPLEMENT_LHASH_HASH_FN(index_name_hash,const char **)
-static IMPLEMENT_LHASH_COMP_FN(index_name_cmp,const char **)
-
 
 int MAIN(int, char **);
 
@@ -318,14 +296,13 @@ int MAIN(int argc, char **argv)
        X509 *x=NULL;
        BIO *in=NULL,*out=NULL,*Sout=NULL,*Cout=NULL;
        char *dbfile=NULL;
-       TXT_DB *db=NULL;
+       CA_DB *db=NULL;
        X509_CRL *crl=NULL;
        X509_REVOKED *r=NULL;
        ASN1_TIME *tmptm;
        ASN1_INTEGER *tmpser;
        char **pp,*p,*f;
        int i,j;
-       long l;
        const EVP_MD *dgst=NULL;
        STACK_OF(CONF_VALUE) *attribs=NULL;
        STACK_OF(X509) *cert_sk=NULL;
@@ -333,8 +310,11 @@ int MAIN(int argc, char **argv)
 #define BSIZE 256
        MS_STATIC char buf[3][BSIZE];
        char *randfile=NULL;
+#ifndef OPENSSL_NO_ENGINE
        char *engine = NULL;
+#endif
        char *tofree=NULL;
+       DB_ATTR db_attr;
 
 #ifdef EFENCE
 EF_PROTECT_FREE=1;
@@ -537,11 +517,13 @@ EF_ALIGNMENT=0;
                        rev_arg = *(++argv);
                        rev_type = REV_CA_COMPROMISE;
                        }
+#ifndef OPENSSL_NO_ENGINE
                else if (strcmp(*argv,"-engine") == 0)
                        {
                        if (--argc < 1) goto bad;
                        engine= *(++argv);
                        }
+#endif
                else
                        {
 bad:
@@ -562,7 +544,9 @@ bad:
 
        ERR_load_crypto_strings();
 
+#ifndef OPENSSL_NO_ENGINE
        e = setup_engine(bio_err, engine, 0);
+#endif
 
        /*****************************************************************/
        tofree=NULL;
@@ -597,7 +581,10 @@ bad:
                goto err;
                }
        if(tofree)
+               {
                OPENSSL_free(tofree);
+               tofree = NULL;
+               }
 
        if (!load_config(bio_err, conf))
                goto err;
@@ -648,6 +635,39 @@ bad:
        if (randfile == NULL)
                ERR_clear_error();
        app_RAND_load_file(randfile, bio_err, 0);
+
+       db_attr.unique_subject = 1;
+       p = NCONF_get_string(conf, section, "unique_subject");
+       if (p)
+               {
+#ifdef RL_DEBUG
+               BIO_printf(bio_err, "DEBUG: unique_subject = \"%s\"\n", p);
+#endif
+               switch(*p)
+                       {
+               case 'f': /* false */
+               case 'F': /* FALSE */
+               case 'n': /* no */
+               case 'N': /* NO */
+                       db_attr.unique_subject = 0;
+                       break;
+               case 't': /* true */
+               case 'T': /* TRUE */
+               case 'y': /* yes */
+               case 'Y': /* YES */
+               default:
+                       db_attr.unique_subject = 1;
+                       break;
+                       }
+               }
+#ifdef RL_DEBUG
+       else
+               BIO_printf(bio_err, "DEBUG: unique_subject undefined\n", p);
+#endif
+#ifdef RL_DEBUG
+       BIO_printf(bio_err, "DEBUG: configured unique_subject is %d\n",
+               db_attr.unique_subject);
+#endif
        
        in=BIO_new(BIO_s_file());
        out=BIO_new(BIO_s_file());
@@ -668,17 +688,10 @@ bad:
                        lookup_fail(section,ENV_DATABASE);
                        goto err;
                        }
-               if (BIO_read_filename(in,dbfile) <= 0)
-                       {
-                       perror(dbfile);
-                       BIO_printf(bio_err,"unable to open '%s'\n",dbfile);
-                       goto err;
-                       }
-               db=TXT_DB_read(in,DB_NUMBER);
+               db = load_index(dbfile,&db_attr);
                if (db == NULL) goto err;
 
-               if (!make_serial_index(db))
-                       goto err;
+               if (!index_index(db)) goto err;
 
                if (get_certificate_status(ser_status,db) != 1)
                        BIO_printf(bio_err,"Error verifying serial %s!\n",
@@ -838,19 +851,13 @@ bad:
                lookup_fail(section,ENV_DATABASE);
                goto err;
                }
-       if (BIO_read_filename(in,dbfile) <= 0)
-               {
-               perror(dbfile);
-               BIO_printf(bio_err,"unable to open '%s'\n",dbfile);
-               goto err;
-               }
-       db=TXT_DB_read(in,DB_NUMBER);
+       db = load_index(dbfile, &db_attr);
        if (db == NULL) goto err;
 
        /* Lets check some fields */
-       for (i=0; i<sk_num(db->data); i++)
+       for (i=0; i<sk_num(db->db->data); i++)
                {
-               pp=(char **)sk_value(db->data,i);
+               pp=(char **)sk_value(db->db->data,i);
                if ((pp[DB_type][0] != DB_TYPE_REV) &&
                        (pp[DB_rev_date][0] != '\0'))
                        {
@@ -901,23 +908,13 @@ bad:
                out = BIO_push(tmpbio, out);
                }
 #endif
-               TXT_DB_write(out,db);
+               TXT_DB_write(out,db->db);
                BIO_printf(bio_err,"%d entries loaded from the database\n",
-                       db->data->num);
+                       db->db->data->num);
                BIO_printf(bio_err,"generating index\n");
                }
        
-       if (!make_serial_index(db))
-               goto err;
-
-       if (!TXT_DB_create_index(db, DB_name, index_name_qual,
-                       LHASH_HASH_FN(index_name_hash),
-                       LHASH_COMP_FN(index_name_cmp)))
-               {
-               BIO_printf(bio_err,"error creating name index:(%ld,%ld,%ld)\n",
-                       db->error,db->arg1,db->arg2);
-               goto err;
-               }
+       if (!index_index(db)) goto err;
 
        /*****************************************************************/
        /* Update the db file for expired certificates */
@@ -940,62 +937,9 @@ bad:
                        }
                else
                        {
-                       out = BIO_new(BIO_s_file());
-                       if (out == NULL)
-                               {
-                               ERR_print_errors(bio_err);
-                               goto err;
-                               }
-
-#ifndef OPENSSL_SYS_VMS
-                       j = BIO_snprintf(buf[0], sizeof buf[0], "%s.new", dbfile);
-#else
-                       j = BIO_snprintf(buf[0], sizeof buf[0], "%s-new", dbfile);
-#endif
-                       if (j < 0 || j >= sizeof buf[0])
-                               {
-                               BIO_printf(bio_err, "file name too long\n");
-                               goto err;
-                               }
-                       if (BIO_write_filename(out,buf[0]) <= 0)
-                               {
-                               perror(dbfile);
-                               BIO_printf(bio_err,"unable to open '%s'\n",
-                                                                       dbfile);
-                               goto err;
-                               }
-                       j=TXT_DB_write(out,db);
-                       if (j <= 0) goto err;
-                       
-                       BIO_free(out);
-                       out = NULL;
-#ifndef OPENSSL_SYS_VMS
-                       j = BIO_snprintf(buf[1], sizeof buf[1], "%s.old", dbfile);
-#else
-                       j = BIO_snprintf(buf[1], sizeof buf[1], "%s-old", dbfile);
-#endif
-                       if (j < 0 || j >= sizeof buf[1])
-                               {
-                               BIO_printf(bio_err, "file name too long\n");
-                               goto err;
-                               }
-                       if (rename(dbfile,buf[1]) < 0)
-                               {
-                               BIO_printf(bio_err,
-                                               "unable to rename %s to %s\n",
-                                               dbfile, buf[1]);
-                               perror("reason");
-                               goto err;
-                               }
-                       if (rename(buf[0],dbfile) < 0)
-                               {
-                               BIO_printf(bio_err,
-                                               "unable to rename %s to %s\n",
-                                               buf[0],dbfile);
-                               perror("reason");
-                               rename(buf[1],dbfile);
-                               goto err;
-                               }
+                       if (!save_index(dbfile,"new",db)) goto err;
+                               
+                       if (!rotate_index(dbfile,"new","old")) goto err;
                                
                        if (verbose) BIO_printf(bio_err,
                                "Done. %d entries marked as expired\n",i); 
@@ -1156,7 +1100,7 @@ bad:
                        goto err;
                        }
 
-               if ((serial=load_serial(serialfile)) == NULL)
+               if ((serial=load_serial(serialfile, 0, NULL)) == NULL)
                        {
                        BIO_printf(bio_err,"error while loading serial number\n");
                        goto err;
@@ -1304,24 +1248,9 @@ bad:
                        strcat(buf[0],".new");
 #endif
 
-                       if (!save_serial(buf[0],serial)) goto err;
+                       if (!save_serial(buf[0],serial,NULL)) goto err;
 
-                       strcpy(buf[1],dbfile);
-
-#ifdef OPENSSL_SYS_VMS
-                       strcat(buf[1],"-new");
-#else
-                       strcat(buf[1],".new");
-#endif
-
-                       if (BIO_write_filename(out,buf[1]) <= 0)
-                               {
-                               perror(dbfile);
-                               BIO_printf(bio_err,"unable to open '%s'\n",dbfile);
-                               goto err;
-                               }
-                       l=TXT_DB_write(out,db);
-                       if (l <= 0) goto err;
+                       if (!save_index(dbfile, "new", db)) goto err;
                        }
        
                if (verbose)
@@ -1408,30 +1337,8 @@ bad:
                                goto err;
                                }
 
-                       strncpy(buf[2],dbfile,BSIZE-4);
-                       buf[2][BSIZE-4]='\0';
+                       if (!rotate_index(dbfile,"new","old")) goto err;
 
-#ifdef OPENSSL_SYS_VMS
-                       strcat(buf[2],"-old");
-#else
-                       strcat(buf[2],".old");
-#endif
-
-                       if (rename(dbfile,buf[2]) < 0)
-                               {
-                               BIO_printf(bio_err,"unable to rename %s to %s\n",
-                                       dbfile,buf[2]);
-                               perror("reason");
-                               goto err;
-                               }
-                       if (rename(buf[1],dbfile) < 0)
-                               {
-                               BIO_printf(bio_err,"unable to rename %s to %s\n",
-                                       buf[1],dbfile);
-                               perror("reason");
-                               rename(buf[2],dbfile);
-                               goto err;
-                               }
                        BIO_printf(bio_err,"Data Base Updated\n");
                        }
                }
@@ -1490,9 +1397,9 @@ bad:
 
                ASN1_TIME_free(tmptm);
 
-               for (i=0; i<sk_num(db->data); i++)
+               for (i=0; i<sk_num(db->db->data); i++)
                        {
-                       pp=(char **)sk_value(db->data,i);
+                       pp=(char **)sk_value(db->db->data,i);
                        if (pp[DB_type][0] == DB_TYPE_REV)
                                {
                                if ((r=X509_REVOKED_new()) == NULL) goto err;
@@ -1581,50 +1488,10 @@ bad:
                        if (j <= 0) goto err;
                        X509_free(revcert);
 
-                       if(strlen(dbfile) > BSIZE-5)
-                               {
-                               BIO_printf(bio_err,"filename too long\n");
-                               goto err;
-                               }
+                       if (!save_index(dbfile, "new", db)) goto err;
+
+                       if (!rotate_index(dbfile, "new", "old")) goto err;
 
-                       strcpy(buf[0],dbfile);
-#ifndef OPENSSL_SYS_VMS
-                       strcat(buf[0],".new");
-#else
-                       strcat(buf[0],"-new");
-#endif
-                       if (BIO_write_filename(out,buf[0]) <= 0)
-                               {
-                               perror(dbfile);
-                               BIO_printf(bio_err,"unable to open '%s'\n",dbfile);
-                               goto err;
-                               }
-                       j=TXT_DB_write(out,db);
-                       if (j <= 0) goto err;
-                       strncpy(buf[1],dbfile,BSIZE-4);
-                       buf[1][BSIZE-4]='\0';
-#ifndef OPENSSL_SYS_VMS
-                       strcat(buf[1],".old");
-#else
-                       strcat(buf[1],"-old");
-#endif
-                       BIO_free(in);
-                       in = NULL;
-                       BIO_free(out);
-                       out = NULL;
-                       if (rename(dbfile,buf[1]) < 0)
-                               {
-                               BIO_printf(bio_err,"unable to rename %s to %s\n", dbfile, buf[1]);
-                               perror("reason");
-                               goto err;
-                               }
-                       if (rename(buf[0],dbfile) < 0)
-                               {
-                               BIO_printf(bio_err,"unable to rename %s to %s\n", buf[0],dbfile);
-                               perror("reason");
-                               rename(buf[1],dbfile);
-                               goto err;
-                               }
                        BIO_printf(bio_err,"Data Base Updated\n"); 
                        }
                }
@@ -1638,14 +1505,15 @@ err:
        BIO_free_all(out);
        BIO_free_all(in);
 
-       sk_X509_pop_free(cert_sk,X509_free);
+       if (cert_sk)
+               sk_X509_pop_free(cert_sk,X509_free);
 
        if (ret) ERR_print_errors(bio_err);
        app_RAND_write_file(randfile, bio_err);
-       if (free_key)
+       if (free_key && key)
                OPENSSL_free(key);
        BN_free(serial);
-       TXT_DB_free(db);
+       free_index(db);
        EVP_PKEY_free(pkey);
        X509_free(x509);
        X509_CRL_free(crl);
@@ -1660,106 +1528,8 @@ static void lookup_fail(char *name, char *tag)
        BIO_printf(bio_err,"variable lookup failed for %s::%s\n",name,tag);
        }
 
-static unsigned long index_serial_hash(const char **a)
-       {
-       const char *n;
-
-       n=a[DB_serial];
-       while (*n == '0') n++;
-       return(lh_strhash(n));
-       }
-
-static int index_serial_cmp(const char **a, const char **b)
-       {
-       const char *aa,*bb;
-
-       for (aa=a[DB_serial]; *aa == '0'; aa++);
-       for (bb=b[DB_serial]; *bb == '0'; bb++);
-       return(strcmp(aa,bb));
-       }
-
-static unsigned long index_name_hash(const char **a)
-       { return(lh_strhash(a[DB_name])); }
-
-static int index_name_qual(char **a)
-       { return(a[0][0] == 'V'); }
-
-static int index_name_cmp(const char **a, const char **b)
-       { return(strcmp(a[DB_name],
-            b[DB_name])); }
-
-static BIGNUM *load_serial(char *serialfile)
-       {
-       BIO *in=NULL;
-       BIGNUM *ret=NULL;
-       MS_STATIC char buf[1024];
-       ASN1_INTEGER *ai=NULL;
-
-       if ((in=BIO_new(BIO_s_file())) == NULL)
-               {
-               ERR_print_errors(bio_err);
-               goto err;
-               }
-
-       if (BIO_read_filename(in,serialfile) <= 0)
-               {
-               perror(serialfile);
-               goto err;
-               }
-       ai=ASN1_INTEGER_new();
-       if (ai == NULL) goto err;
-       if (!a2i_ASN1_INTEGER(in,ai,buf,1024))
-               {
-               BIO_printf(bio_err,"unable to load number from %s\n",
-                       serialfile);
-               goto err;
-               }
-       ret=ASN1_INTEGER_to_BN(ai,NULL);
-       if (ret == NULL)
-               {
-               BIO_printf(bio_err,"error converting number from bin to BIGNUM\n");
-               goto err;
-               }
-err:
-       if (in != NULL) BIO_free(in);
-       if (ai != NULL) ASN1_INTEGER_free(ai);
-       return(ret);
-       }
-
-static int save_serial(char *serialfile, BIGNUM *serial)
-       {
-       BIO *out;
-       int ret=0;
-       ASN1_INTEGER *ai=NULL;
-
-       out=BIO_new(BIO_s_file());
-       if (out == NULL)
-               {
-               ERR_print_errors(bio_err);
-               goto err;
-               }
-       if (BIO_write_filename(out,serialfile) <= 0)
-               {
-               perror(serialfile);
-               goto err;
-               }
-
-       if ((ai=BN_to_ASN1_INTEGER(serial,NULL)) == NULL)
-               {
-               BIO_printf(bio_err,"error converting serial to ASN.1 format\n");
-               goto err;
-               }
-       i2a_ASN1_INTEGER(out,ai);
-       BIO_puts(out,"\n");
-       ret=1;
-err:
-       if (out != NULL) BIO_free_all(out);
-       if (ai != NULL) ASN1_INTEGER_free(ai);
-       return(ret);
-       }
-
 static int certify(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
-            const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, TXT_DB *db,
+            const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
             BIGNUM *serial, char *subj, int email_dn, char *startdate, char *enddate,
             long days, int batch, char *ext_sect, CONF *lconf, int verbose,
             unsigned long certopt, unsigned long nameopt, int default_op,
@@ -1821,7 +1591,7 @@ err:
        }
 
 static int certify_cert(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
-            const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, TXT_DB *db,
+            const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
             BIGNUM *serial, char *subj, int email_dn, char *startdate, char *enddate,
             long days, int batch, char *ext_sect, CONF *lconf, int verbose,
             unsigned long certopt, unsigned long nameopt, int default_op,
@@ -1875,7 +1645,7 @@ err:
        }
 
 static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
-            STACK_OF(CONF_VALUE) *policy, TXT_DB *db, BIGNUM *serial, char *subj,
+            STACK_OF(CONF_VALUE) *policy, CA_DB *db, BIGNUM *serial, char *subj,
             int email_dn, char *startdate, char *enddate, long days, int batch,
             int verbose, X509_REQ *req, char *ext_sect, CONF *lconf,
             unsigned long certopt, unsigned long nameopt, int default_op,
@@ -1893,7 +1663,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
        int ok= -1,i,j,last,nid;
        char *p;
        CONF_VALUE *cv;
-       char *row[DB_NUMBER],**rrow,**irow=NULL;
+       char *row[DB_NUMBER],**rrow=NULL,**irow=NULL;
        char buf[25];
 
        tmptm=ASN1_UTCTIME_new();
@@ -2130,15 +1900,19 @@ again2:
                goto err;
                }
 
-       rrow=TXT_DB_get_by_index(db,DB_name,row);
-       if (rrow != NULL)
+       if (db->attributes.unique_subject)
                {
-               BIO_printf(bio_err,"ERROR:There is already a certificate for %s\n",
-                       row[DB_name]);
+               rrow=TXT_DB_get_by_index(db->db,DB_name,row);
+               if (rrow != NULL)
+                       {
+                       BIO_printf(bio_err,
+                               "ERROR:There is already a certificate for %s\n",
+                               row[DB_name]);
+                       }
                }
-       else
+       if (rrow == NULL)
                {
-               rrow=TXT_DB_get_by_index(db,DB_serial,row);
+               rrow=TXT_DB_get_by_index(db->db,DB_serial,row);
                if (rrow != NULL)
                        {
                        BIO_printf(bio_err,"ERROR:Serial number %s has already been issued,\n",
@@ -2186,7 +1960,7 @@ again2:
 
 #ifdef X509_V3
        /* Make it an X509 v3 certificate. */
-       if (!X509_set_version(x509,2)) goto err;
+       if (!X509_set_version(ret,2)) goto err;
 #endif
 
        if (BN_to_ASN1_INTEGER(serial,ci->serialNumber) == NULL)
@@ -2372,10 +2146,10 @@ again2:
                }
        irow[DB_NUMBER]=NULL;
 
-       if (!TXT_DB_insert(db,irow))
+       if (!TXT_DB_insert(db->db,irow))
                {
                BIO_printf(bio_err,"failed to update database\n");
-               BIO_printf(bio_err,"TXT_DB error number %ld\n",db->error);
+               BIO_printf(bio_err,"TXT_DB error number %ld\n",db->db->error);
                goto err;
                }
        ok=1;
@@ -2426,7 +2200,7 @@ static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext)
        }
 
 static int certify_spkac(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
-            const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, TXT_DB *db,
+            const EVP_MD *dgst, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
             BIGNUM *serial, char *subj, int email_dn, char *startdate, char *enddate,
             long days, char *ext_sect, CONF *lconf, int verbose, unsigned long certopt,
             unsigned long nameopt, int default_op, int ext_copy)
@@ -2605,7 +2379,7 @@ static int check_time_format(char *str)
        return(ASN1_UTCTIME_check(&tm));
        }
 
-static int do_revoke(X509 *x509, TXT_DB *db, int type, char *value)
+static int do_revoke(X509 *x509, CA_DB *db, int type, char *value)
        {
        ASN1_UTCTIME *tm=NULL;
        char *row[DB_NUMBER],**rrow,**irow;
@@ -2630,10 +2404,10 @@ static int do_revoke(X509 *x509, TXT_DB *db, int type, char *value)
        /* We have to lookup by serial number because name lookup
         * skips revoked certs
         */
-       rrow=TXT_DB_get_by_index(db,DB_serial,row);
+       rrow=TXT_DB_get_by_index(db->db,DB_serial,row);
        if (rrow == NULL)
                {
-               BIO_printf(bio_err,"Adding Entry to DB for %s\n", row[DB_name]);
+               BIO_printf(bio_err,"Adding Entry with serial number %s to DB for %s\n", row[DB_serial], row[DB_name]);
 
                /* We now just add it to the database */
                row[DB_type]=(char *)OPENSSL_malloc(2);
@@ -2673,10 +2447,10 @@ static int do_revoke(X509 *x509, TXT_DB *db, int type, char *value)
                        }
                irow[DB_NUMBER]=NULL;
 
-               if (!TXT_DB_insert(db,irow))
+               if (!TXT_DB_insert(db->db,irow))
                        {
                        BIO_printf(bio_err,"failed to update database\n");
-                       BIO_printf(bio_err,"TXT_DB error number %ld\n",db->error);
+                       BIO_printf(bio_err,"TXT_DB error number %ld\n",db->db->error);
                        goto err;
                        }
 
@@ -2721,7 +2495,7 @@ err:
        return(ok);
        }
 
-static int get_certificate_status(const char *serial, TXT_DB *db)
+static int get_certificate_status(const char *serial, CA_DB *db)
        {
        char *row[DB_NUMBER],**rrow;
        int ok=-1,i;
@@ -2762,7 +2536,7 @@ static int get_certificate_status(const char *serial, TXT_DB *db)
        ok=1;
 
        /* Search for the certificate */
-       rrow=TXT_DB_get_by_index(db,DB_serial,row);
+       rrow=TXT_DB_get_by_index(db->db,DB_serial,row);
        if (rrow == NULL)
                {
                BIO_printf(bio_err,"Serial %s not present in db.\n",
@@ -2809,7 +2583,7 @@ err:
        return(ok);
        }
 
-static int do_updatedb (TXT_DB *db)
+static int do_updatedb (CA_DB *db)
        {
        ASN1_UTCTIME    *a_tm = NULL;
        int i, cnt = 0;
@@ -2835,9 +2609,9 @@ static int do_updatedb (TXT_DB *db)
        else
                a_y2k = 0;
 
-       for (i = 0; i < sk_num(db->data); i++)
+       for (i = 0; i < sk_num(db->db->data); i++)
                {
-               rrow = (char **) sk_value(db->data, i);
+               rrow = (char **) sk_value(db->db->data, i);
 
                if (rrow[DB_type][0] == 'V')
                        {
@@ -3325,16 +3099,3 @@ int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold, ASN1_G
        return ret;
        }
 
-int make_serial_index(TXT_DB *db)
-       {
-       if (!TXT_DB_create_index(db, DB_serial, NULL,
-                               LHASH_HASH_FN(index_serial_hash),
-                               LHASH_COMP_FN(index_serial_cmp)))
-               {
-               BIO_printf(bio_err,
-                 "error creating serial number index:(%ld,%ld,%ld)\n",
-                                       db->error,db->arg1,db->arg2);
-                       return 0;
-               }
-       return 1;
-       }