Get rid of more non-ANSI declarations.
[openssl.git] / apps / ca.c
index 93f992b..7ab8c3b 100644 (file)
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -178,7 +178,6 @@ extern int EF_ALIGNMENT;
 
 static int add_oid_section(LHASH *conf);
 static void lookup_fail(char *name,char *tag);
-static int MS_CALLBACK key_callback(char *buf,int len,int verify,void *u);
 static unsigned long index_serial_hash(char **a);
 static int index_serial_cmp(char **a, char **b);
 static unsigned long index_name_hash(char **a);
@@ -201,7 +200,7 @@ static int certify_spkac(X509 **xret, char *infile,EVP_PKEY *pkey,X509 *x509,
                         char *enddate, int days, char *ext_sect,LHASH *conf,
                                int verbose);
 static int fix_data(int nid, int *type);
-static void write_new_certificate(BIO *bp, X509 *x, int output_der);
+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 *startdate, char *enddate, int days, int batch, int verbose,
@@ -209,14 +208,16 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
 static int do_revoke(X509 *x509, TXT_DB *db);
 static int check_time_format(char *str);
 static LHASH *conf=NULL;
-static char *key=NULL;
 static char *section=NULL;
 
 static int preserve=0;
 static int msie_hack=0;
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
+       char *key=NULL;
        int total=0;
        int total_done=0;
        int badops=0;
@@ -248,6 +249,7 @@ int MAIN(int argc, char **argv)
        char *enddate=NULL;
        int days=0;
        int batch=0;
+       int notext=0;
        X509 *x509=NULL;
        X509 *x=NULL;
        BIO *in=NULL,*out=NULL,*Sout=NULL,*Cout=NULL;
@@ -266,7 +268,7 @@ int MAIN(int argc, char **argv)
 #undef BSIZE
 #define BSIZE 256
        MS_STATIC char buf[3][BSIZE];
-       char *randfile;
+       char *randfile=NULL;
 
 #ifdef EFENCE
 EF_PROTECT_FREE=1;
@@ -280,8 +282,6 @@ EF_ALIGNMENT=0;
        key = NULL;
        section = NULL;
 
-       X509V3_add_standard_extensions();
-
        preserve=0;
        msie_hack=0;
        if (bio_err == NULL)
@@ -360,6 +360,8 @@ EF_ALIGNMENT=0;
                        if (--argc < 1) goto bad;
                        outdir= *(++argv);
                        }
+               else if (strcmp(*argv,"-notext") == 0)
+                       notext=1;
                else if (strcmp(*argv,"-batch") == 0)
                        batch=1;
                else if (strcmp(*argv,"-preserveDN") == 0)
@@ -517,7 +519,7 @@ bad:
                }
 
        /*****************************************************************/
-       /* we definitly need an public key, so lets get it */
+       /* we definitely need an public key, so lets get it */
 
        if ((keyfile == NULL) && ((keyfile=CONF_get_string(conf,
                section,ENV_PRIVATE_KEY)) == NULL))
@@ -531,13 +533,8 @@ bad:
                BIO_printf(bio_err,"trying to load CA private key\n");
                goto err;
                }
-       if (key == NULL)
-               pkey=PEM_read_bio_PrivateKey(in,NULL,NULL,NULL);
-       else
-               {
-               pkey=PEM_read_bio_PrivateKey(in,NULL,key_callback,NULL);
-               memset(key,0,strlen(key));
-               }
+               pkey=PEM_read_bio_PrivateKey(in,NULL,NULL,key);
+               if(key) memset(key,0,strlen(key));
        if (pkey == NULL)
                {
                BIO_printf(bio_err,"unable to load CA private key\n");
@@ -590,14 +587,19 @@ bad:
                        BIO_printf(bio_err,"there needs to be defined a directory for new certificate to be placed in\n");
                        goto err;
                        }
-#ifdef VMS
-               /* For technical reasons, VMS misbehaves with X_OK */
-               if (access(outdir,R_OK|W_OK) != 0)
-#else
+#ifndef VMS /* outdir is a directory spec, but access() for VMS demands a
+              filename.  In any case, stat(), below, will catch the problem
+              if outdir is not a directory spec, and the fopen() or open()
+              will catch an error if there is no write access.
+
+              Presumably, this problem could also be solved by using the DEC
+              C routines to convert the directory syntax to Unixly, and give
+              that to access().  However, time's too short to do that just
+              now.
+            */
                if (access(outdir,R_OK|W_OK|X_OK) != 0)
-#endif
                        {
-                       BIO_printf(bio_err,"I am unable to acces the %s directory\n",outdir);
+                       BIO_printf(bio_err,"I am unable to access the %s directory\n",outdir);
                        perror(outdir);
                        goto err;
                        }
@@ -615,6 +617,7 @@ bad:
                        perror(outdir);
                        goto err;
                        }
+#endif
 #endif
                }
 
@@ -681,7 +684,7 @@ bad:
                TXT_DB_write(out,db);
                BIO_printf(bio_err,"%d entries loaded from the database\n",
                        db->data->num);
-               BIO_printf(bio_err,"generating indexs\n");
+               BIO_printf(bio_err,"generating index\n");
                }
        
        if (!TXT_DB_create_index(db,DB_serial,NULL,index_serial_hash,
@@ -992,8 +995,8 @@ bad:
                                perror(buf[2]);
                                goto err;
                                }
-                       write_new_certificate(Cout,x, 0);
-                       write_new_certificate(Sout,x, output_der);
+                       write_new_certificate(Cout,x, 0, notext);
+                       write_new_certificate(Sout,x, output_der, notext);
                        }
 
                if (sk_num(cert_sk))
@@ -1013,14 +1016,14 @@ bad:
                        out=NULL;
                        if (rename(serialfile,buf[2]) < 0)
                                {
-                               BIO_printf(bio_err,"unabel to rename %s to %s\n",
+                               BIO_printf(bio_err,"unable to rename %s to %s\n",
                                        serialfile,buf[2]);
                                perror("reason");
                                goto err;
                                }
                        if (rename(buf[0],serialfile) < 0)
                                {
-                               BIO_printf(bio_err,"unabel to rename %s to %s\n",
+                               BIO_printf(bio_err,"unable to rename %s to %s\n",
                                        buf[0],serialfile);
                                perror("reason");
                                rename(buf[2],serialfile);
@@ -1037,14 +1040,14 @@ bad:
 
                        if (rename(dbfile,buf[2]) < 0)
                                {
-                               BIO_printf(bio_err,"unabel to rename %s to %s\n",
+                               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,"unabel to rename %s to %s\n",
+                               BIO_printf(bio_err,"unable to rename %s to %s\n",
                                        buf[1],dbfile);
                                perror("reason");
                                rename(buf[2],dbfile);
@@ -1230,7 +1233,7 @@ err:
        BIO_free(out);
        BIO_free(in);
 
-       sk_pop_free(cert_sk,X509_free);
+       sk_pop_free(cert_sk, (void(*)(void *)) X509_free);
 
        if (ret) ERR_print_errors(bio_err);
        app_RAND_write_file(randfile, bio_err);
@@ -1240,7 +1243,6 @@ err:
        X509_free(x509);
        X509_CRL_free(crl);
        CONF_free(conf);
-       X509V3_EXT_cleanup();
        OBJ_cleanup();
        EXIT(ret);
        }
@@ -1250,17 +1252,6 @@ static void lookup_fail(char *name, char *tag)
        BIO_printf(bio_err,"variable lookup failed for %s::%s\n",name,tag);
        }
 
-static int MS_CALLBACK key_callback(char *buf, int len, int verify, void *u)
-       {
-       int i;
-
-       if (key == NULL) return(0);
-       i=strlen(key);
-       i=(i > len)?len:i;
-       memcpy(buf,key,i);
-       return(i);
-       }
-
 static unsigned long index_serial_hash(char **a)
        {
        char *n;
@@ -1671,7 +1662,7 @@ again2:
                                        }
                                if (j < 0)
                                        {
-                                       BIO_printf(bio_err,"The %s field needed to be the same in the\nCA certificate (%s) and the request (%s)\n",cv->name,((str == NULL)?"NULL":(char *)str->data),((str2 == NULL)?"NULL":(char *)str2->data));
+                                       BIO_printf(bio_err,"The %s field needed to be the same in the\nCA certificate (%s) and the request (%s)\n",cv->name,((str2 == NULL)?"NULL":(char *)str2->data),((str == NULL)?"NULL":(char *)str->data));
                                        goto err;
                                        }
                                }
@@ -1703,7 +1694,7 @@ again2:
                }
 
        if (verbose)
-               BIO_printf(bio_err,"The subject name apears to be ok, checking data base for clashes\n");
+               BIO_printf(bio_err,"The subject name appears to be ok, checking data base for clashes\n");
 
        row[DB_name]=X509_NAME_oneline(subject,NULL,0);
        row[DB_serial]=BN_bn2hex(serial);
@@ -1760,7 +1751,7 @@ again2:
                goto err;
                }
 
-       /* We are now totaly happy, lets make and sign the certificate */
+       /* We are now totally happy, lets make and sign the certificate */
        if (verbose)
                BIO_printf(bio_err,"Everything appears to be ok, creating and signing the certificate\n");
 
@@ -1807,7 +1798,7 @@ again2:
                ASN1_INTEGER_set(ci->version,2); /* version 3 certificate */
 
                /* Free the current entries if any, there should not
-                * be any I belive */
+                * be any I believe */
                if (ci->extensions != NULL)
                        sk_X509_EXTENSION_pop_free(ci->extensions,
                                                   X509_EXTENSION_free);
@@ -1913,17 +1904,16 @@ err:
        return(ok);
        }
 
-static void write_new_certificate(BIO *bp, X509 *x, int output_der)
+static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext)
        {
-       char *f;
-       char buf[256];
 
        if (output_der)
                {
                (void)i2d_X509_bio(bp,x);
                return;
                }
-
+#if 0
+       /* ??? Not needed since X509_print prints all this stuff anyway */
        f=X509_NAME_oneline(X509_get_issuer_name(x),buf,256);
        BIO_printf(bp,"issuer :%s\n",f);
 
@@ -1933,10 +1923,9 @@ static void write_new_certificate(BIO *bp, X509 *x, int output_der)
        BIO_puts(bp,"serial :");
        i2a_ASN1_INTEGER(bp,x->cert_info->serialNumber);
        BIO_puts(bp,"\n\n");
-       X509_print(bp,x);
-       BIO_puts(bp,"\n");
+#endif
+       if(!notext)X509_print(bp,x);
        PEM_write_bio_X509(bp,x);
-       BIO_puts(bp,"\n");
        }
 
 static int certify_spkac(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,