OpenSSL 0.9.7 stable 2002 05 08 merge

1 files changed, 498 insertions, 207 deletions

diff --git a/src/lib/libssl/src/apps/req.c b/src/lib/libssl/src/apps/req.c
index ca8dc87957..790aa90eb6 100644
--- a/src/lib/libssl/src/apps/req.c
+++ b/src/lib/libssl/src/apps/req.c
@@ -60,7 +60,7 @@
 #include <stdlib.h>
 #include <time.h>
 #include <string.h>
-#ifdef NO_STDIO
+#ifdef OPENSSL_NO_STDIO
 #define APPS_WIN16
 #endif
 #include "apps.h"
@@ -73,7 +73,6 @@
 #include <openssl/x509v3.h>
 #include <openssl/objects.h>
 #include <openssl/pem.h>
-#include <openssl/engine.h>
 
 #define SECTION         "req"
 
@@ -85,6 +84,7 @@
 #define V3_EXTENSIONS   "x509_extensions"
 #define REQ_EXTENSIONS  "req_extensions"
 #define STRING_MASK     "string_mask"
+#define UTF8_IN         "utf8"
 
 #define DEFAULT_KEY_LENGTH      512
 #define MIN_KEY_LENGTH          384
@@ -102,36 +102,42 @@
  * -nodes       - no des encryption
  * -config file - Load configuration file.
  * -key file    - make a request using key in file (or use it for verification).
- * -keyform     - key file format.
+ * -keyform arg - key file format.
  * -rand file(s) - load the file(s) into the PRNG.
  * -newkey      - make a key and a request.
  * -modulus     - print RSA modulus.
+ * -pubkey      - output Public Key.
  * -x509        - output a self signed X509 structure instead.
  * -asn1-kludge - output new certificate request in a format that some CA's
  *                require.  This format is wrong
  */
 
-static int make_REQ(X509_REQ *req,EVP_PKEY *pkey,int attribs);
+static int make_REQ(X509_REQ *req,EVP_PKEY *pkey,char *dn,int attribs,
+                unsigned long chtype);
+static int build_subject(X509_REQ *req, char *subj, unsigned long chtype);
 static int prompt_info(X509_REQ *req,
                 STACK_OF(CONF_VALUE) *dn_sk, char *dn_sect,
-                STACK_OF(CONF_VALUE) *attr_sk, char *attr_sect, int attribs);
+                STACK_OF(CONF_VALUE) *attr_sk, char *attr_sect, int attribs,
+                unsigned long chtype);
 static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *sk,
-                                STACK_OF(CONF_VALUE) *attr, int attribs);
+                                STACK_OF(CONF_VALUE) *attr, int attribs,
+                                unsigned long chtype);
 static int add_attribute_object(X509_REQ *req, char *text,
-                                char *def, char *value, int nid, int min,
-                                int max);
+                                char *def, char *value, int nid, int n_min,
+                                int n_max, unsigned long chtype);
 static int add_DN_object(X509_NAME *n, char *text, char *def, char *value,
-        int nid,int min,int max);
-#ifndef NO_RSA
+        int nid,int n_min,int n_max, unsigned long chtype);
+#ifndef OPENSSL_NO_RSA
 static void MS_CALLBACK req_cb(int p,int n,void *arg);
 #endif
-static int req_check_len(int len,int min,int max);
+static int req_check_len(int len,int n_min,int n_max);
 static int check_end(char *str, char *end);
 #ifndef MONOLITH
 static char *default_config_file=NULL;
-static LHASH *config=NULL;
+static CONF *config=NULL;
 #endif
-static LHASH *req_conf=NULL;
+static CONF *req_conf=NULL;
+static int batch=0;
 
 #define TYPE_RSA        1
 #define TYPE_DSA        2
@@ -142,34 +148,40 @@ int MAIN(int, char **);
 int MAIN(int argc, char **argv)
         {
         ENGINE *e = NULL;
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
         DSA *dsa_params=NULL;
 #endif
+        unsigned long nmflag = 0;
         int ex=1,x509=0,days=30;
         X509 *x509ss=NULL;
         X509_REQ *req=NULL;
         EVP_PKEY *pkey=NULL;
-        int i,badops=0,newreq=0,newkey= -1,pkey_type=0;
+        int i=0,badops=0,newreq=0,verbose=0,pkey_type=TYPE_RSA;
+        long newkey = -1;
         BIO *in=NULL,*out=NULL;
         int informat,outformat,verify=0,noout=0,text=0,keyform=FORMAT_PEM;
-        int nodes=0,kludge=0,newhdr=0;
+        int nodes=0,kludge=0,newhdr=0,subject=0,pubkey=0;
         char *infile,*outfile,*prog,*keyfile=NULL,*template=NULL,*keyout=NULL;
         char *engine=NULL;
         char *extensions = NULL;
         char *req_exts = NULL;
-        EVP_CIPHER *cipher=NULL;
+        const EVP_CIPHER *cipher=NULL;
+        ASN1_INTEGER *serial = NULL;
         int modulus=0;
         char *inrand=NULL;
         char *passargin = NULL, *passargout = NULL;
         char *passin = NULL, *passout = NULL;
         char *p;
+        char *subj = NULL;
         const EVP_MD *md_alg=NULL,*digest=EVP_md5();
+        unsigned long chtype = MBSTRING_ASC;
 #ifndef MONOLITH
         MS_STATIC char config_name[256];
+        long errline;
 #endif
 
         req_conf = NULL;
-#ifndef NO_DES
+#ifndef OPENSSL_NO_DES
         cipher=EVP_des_ede3_cbc();
 #endif
         apps_startup();
@@ -208,9 +220,12 @@ int MAIN(int argc, char **argv)
                         if (--argc < 1) goto bad;
                         keyfile= *(++argv);
                         }
+                else if (strcmp(*argv,"-pubkey") == 0)
+                        {
+                        pubkey=1;
+                        }
                 else if (strcmp(*argv,"-new") == 0)
                         {
-                        pkey_type=TYPE_RSA;
                         newreq=1;
                         }
                 else if (strcmp(*argv,"-config") == 0)
@@ -268,7 +283,7 @@ int MAIN(int argc, char **argv)
                                 newkey= atoi(p);
                                 }
                         else
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
                                 if (strncmp("dsa:",p,4) == 0)
                                 {
                                 X509 *xtmp=NULL;
@@ -291,7 +306,7 @@ int MAIN(int argc, char **argv)
                                                 goto end;
                                                 }
 
-                                        dtmp=X509_get_pubkey(xtmp);
+                                        if ((dtmp=X509_get_pubkey(xtmp)) == NULL) goto end;
                                         if (dtmp->type == EVP_PKEY_DSA)
                                                 dsa_params=DSAparams_dup(dtmp->pkey.dsa);
                                         EVP_PKEY_free(dtmp);
@@ -308,7 +323,7 @@ int MAIN(int argc, char **argv)
                                 }
                         else 
 #endif
-#ifndef NO_DH
+#ifndef OPENSSL_NO_DH
                                 if (strncmp("dh:",p,4) == 0)
                                 {
                                 pkey_type=TYPE_DH;
@@ -320,6 +335,8 @@ int MAIN(int argc, char **argv)
 
                         newreq=1;
                         }
+                else if (strcmp(*argv,"-batch") == 0)
+                        batch=1;
                 else if (strcmp(*argv,"-newhdr") == 0)
                         newhdr=1;
                 else if (strcmp(*argv,"-modulus") == 0)
@@ -330,6 +347,17 @@ int MAIN(int argc, char **argv)
                         nodes=1;
                 else if (strcmp(*argv,"-noout") == 0)
                         noout=1;
+                else if (strcmp(*argv,"-verbose") == 0)
+                        verbose=1;
+                else if (strcmp(*argv,"-utf8") == 0)
+                        chtype = MBSTRING_UTF8;
+                else if (strcmp(*argv,"-nameopt") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        if (!set_name_ex(&nmflag, *(++argv))) goto bad;
+                        }
+                else if (strcmp(*argv,"-subject") == 0)
+                        subject=1;
                 else if (strcmp(*argv,"-text") == 0)
                         text=1;
                 else if (strcmp(*argv,"-x509") == 0)
@@ -338,12 +366,23 @@ int MAIN(int argc, char **argv)
                         kludge=1;
                 else if (strcmp(*argv,"-no-asn1-kludge") == 0)
                         kludge=0;
+                else if (strcmp(*argv,"-subj") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        subj= *(++argv);
+                        }
                 else if (strcmp(*argv,"-days") == 0)
                         {
                         if (--argc < 1) goto bad;
                         days= atoi(*(++argv));
                         if (days == 0) days=30;
                         }
+                else if (strcmp(*argv,"-set_serial") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        serial = s2i_ASN1_INTEGER(NULL, *(++argv));
+                        if (!serial) goto bad;
+                        }
                 else if ((md_alg=EVP_get_digestbyname(&((*argv)[1]))) != NULL)
                         {
                         /* ok */
@@ -379,12 +418,15 @@ bad:
                 BIO_printf(bio_err," -in arg        input file\n");
                 BIO_printf(bio_err," -out arg       output file\n");
                 BIO_printf(bio_err," -text          text form of request\n");
+                BIO_printf(bio_err," -pubkey        output public key\n");
                 BIO_printf(bio_err," -noout         do not output REQ\n");
                 BIO_printf(bio_err," -verify        verify signature on REQ\n");
                 BIO_printf(bio_err," -modulus       RSA modulus\n");
                 BIO_printf(bio_err," -nodes         don't encrypt the output key\n");
-                BIO_printf(bio_err," -engine e      use engine e, possibly a hardware device.\n");
-                BIO_printf(bio_err," -key file  use the private key contained in file\n");
+                BIO_printf(bio_err," -engine e      use engine e, possibly a hardware device\n");
+                BIO_printf(bio_err," -subject       output the request's subject\n");
+                BIO_printf(bio_err," -passin        private key password source\n");
+                BIO_printf(bio_err," -key file      use the private key contained in file\n");
                 BIO_printf(bio_err," -keyform arg   key file format\n");
                 BIO_printf(bio_err," -keyout arg    file to send the key to\n");
                 BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
@@ -392,17 +434,21 @@ bad:
                 BIO_printf(bio_err,"                the random number generator\n");
                 BIO_printf(bio_err," -newkey rsa:bits generate a new RSA key of 'bits' in size\n");
                 BIO_printf(bio_err," -newkey dsa:file generate a new DSA key, parameters taken from CA in 'file'\n");
-
-                BIO_printf(bio_err," -[digest]      Digest to sign with (md5, sha1, md2, mdc2)\n");
+                BIO_printf(bio_err," -[digest]      Digest to sign with (md5, sha1, md2, mdc2, md4)\n");
                 BIO_printf(bio_err," -config file   request template file.\n");
+                BIO_printf(bio_err," -subj arg      set or modify request subject\n");
                 BIO_printf(bio_err," -new           new request.\n");
+                BIO_printf(bio_err," -batch         do not ask anything during request generation\n");
                 BIO_printf(bio_err," -x509          output a x509 structure instead of a cert. req.\n");
-                BIO_printf(bio_err," -days          number of days a x509 generated by -x509 is valid for.\n");
+                BIO_printf(bio_err," -days          number of days a certificate generated by -x509 is valid for.\n");
+                BIO_printf(bio_err," -set_serial    serial number to use for a certificate generated by -x509.\n");
                 BIO_printf(bio_err," -newhdr        output \"NEW\" in the header lines\n");
                 BIO_printf(bio_err," -asn1-kludge   Output the 'request' in a format that is wrong but some CA's\n");
                 BIO_printf(bio_err,"                have been reported as requiring\n");
                 BIO_printf(bio_err," -extensions .. specify certificate extension section (override value in config file)\n");
                 BIO_printf(bio_err," -reqexts ..    specify request extension section (override value in config file)\n");
+                BIO_printf(bio_err," -utf8          input characters are UTF8 (default ASCII)\n");
+                BIO_printf(bio_err," -nameopt arg    - various certificate name options\n");
                 goto end;
                 }
 
@@ -420,23 +466,26 @@ bad:
         if (p == NULL)
                 {
                 strcpy(config_name,X509_get_default_cert_area());
-#ifndef VMS
+#ifndef OPENSSL_SYS_VMS
                 strcat(config_name,"/");
 #endif
                 strcat(config_name,OPENSSL_CONF);
                 p=config_name;
                 }
         default_config_file=p;
-        config=CONF_load(config,p,NULL);
+        config=NCONF_new(NULL);
+        i=NCONF_load(config, p, &errline);
 #endif
 
         if (template != NULL)
                 {
                 long errline;
 
-                BIO_printf(bio_err,"Using configuration from %s\n",template);
-                req_conf=CONF_load(NULL,template,&errline);
-                if (req_conf == NULL)
+                if( verbose )
+                        BIO_printf(bio_err,"Using configuration from %s\n",template);
+                req_conf=NCONF_new(NULL);
+                i=NCONF_load(req_conf,template,&errline);
+                if (i == 0)
                         {
                         BIO_printf(bio_err,"error on line %ld of %s\n",errline,template);
                         goto end;
@@ -445,7 +494,8 @@ bad:
         else
                 {
                 req_conf=config;
-                BIO_printf(bio_err,"Using configuration from %s\n",
+                if( verbose )
+                        BIO_printf(bio_err,"Using configuration from %s\n",
                         default_config_file);
                 if (req_conf == NULL)
                         {
@@ -455,7 +505,11 @@ bad:
 
         if (req_conf != NULL)
                 {
-                p=CONF_get_string(req_conf,NULL,"oid_file");
+                if (!load_config(bio_err, req_conf))
+                        goto end;
+                p=NCONF_get_string(req_conf,NULL,"oid_file");
+                if (p == NULL)
+                        ERR_clear_error();
                 if (p != NULL)
                         {
                         BIO *oid_bio;
@@ -475,23 +529,32 @@ bad:
                                 }
                         }
                 }
-                if(!add_oid_section(bio_err, req_conf)) goto end;
+        if(!add_oid_section(bio_err, req_conf)) goto end;
 
-        if ((md_alg == NULL) &&
-                ((p=CONF_get_string(req_conf,SECTION,"default_md")) != NULL))
+        if (md_alg == NULL)
                 {
-                if ((md_alg=EVP_get_digestbyname(p)) != NULL)
-                        digest=md_alg;
+                p=NCONF_get_string(req_conf,SECTION,"default_md");
+                if (p == NULL)
+                        ERR_clear_error();
+                if (p != NULL)
+                        {
+                        if ((md_alg=EVP_get_digestbyname(p)) != NULL)
+                                digest=md_alg;
+                        }
                 }
 
-        if(!extensions)
-                extensions = CONF_get_string(req_conf, SECTION, V3_EXTENSIONS);
-        if(extensions) {
+        if (!extensions)
+                {
+                extensions = NCONF_get_string(req_conf, SECTION, V3_EXTENSIONS);
+                if (!extensions)
+                        ERR_clear_error();
+                }
+        if (extensions) {
                 /* Check syntax of file */
                 X509V3_CTX ctx;
                 X509V3_set_ctx_test(&ctx);
-                X509V3_set_conf_lhash(&ctx, req_conf);
-                if(!X509V3_EXT_add_conf(req_conf, &ctx, extensions, NULL)) {
+                X509V3_set_nconf(&ctx, req_conf);
+                if(!X509V3_EXT_add_nconf(req_conf, &ctx, extensions, NULL)) {
                         BIO_printf(bio_err,
                          "Error Loading extension section %s\n", extensions);
                         goto end;
@@ -499,26 +562,50 @@ bad:
         }
 
         if(!passin)
-                passin = CONF_get_string(req_conf, SECTION, "input_password");
-
+                {
+                passin = NCONF_get_string(req_conf, SECTION, "input_password");
+                if (!passin)
+                        ERR_clear_error();
+                }
+        
         if(!passout)
-                passout = CONF_get_string(req_conf, SECTION, "output_password");
+                {
+                passout = NCONF_get_string(req_conf, SECTION, "output_password");
+                if (!passout)
+                        ERR_clear_error();
+                }
 
-        p = CONF_get_string(req_conf, SECTION, STRING_MASK);
+        p = NCONF_get_string(req_conf, SECTION, STRING_MASK);
+        if (!p)
+                ERR_clear_error();
 
         if(p && !ASN1_STRING_set_default_mask_asc(p)) {
                 BIO_printf(bio_err, "Invalid global string mask setting %s\n", p);
                 goto end;
         }
 
+        if (chtype != MBSTRING_UTF8)
+                {
+                p = NCONF_get_string(req_conf, SECTION, UTF8_IN);
+                if (!p)
+                        ERR_clear_error();
+                else if (!strcmp(p, "yes"))
+                        chtype = MBSTRING_UTF8;
+                }
+
+
         if(!req_exts)
-                req_exts = CONF_get_string(req_conf, SECTION, REQ_EXTENSIONS);
+                {
+                req_exts = NCONF_get_string(req_conf, SECTION, REQ_EXTENSIONS);
+                if (!req_exts)
+                        ERR_clear_error();
+                }
         if(req_exts) {
                 /* Check syntax of file */
                 X509V3_CTX ctx;
                 X509V3_set_ctx_test(&ctx);
-                X509V3_set_conf_lhash(&ctx, req_conf);
-                if(!X509V3_EXT_add_conf(req_conf, &ctx, req_exts, NULL)) {
+                X509V3_set_nconf(&ctx, req_conf);
+                if(!X509V3_EXT_add_nconf(req_conf, &ctx, req_exts, NULL)) {
                         BIO_printf(bio_err,
                          "Error Loading request extension section %s\n",
                                                                 req_exts);
@@ -531,80 +618,39 @@ bad:
         if ((in == NULL) || (out == NULL))
                 goto end;
 
-        if (engine != NULL)
-                {
-                if((e = ENGINE_by_id(engine)) == NULL)
-                        {
-                        BIO_printf(bio_err,"invalid engine \"%s\"\n",
-                                engine);
-                        goto end;
-                        }
-                if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
-                        {
-                        BIO_printf(bio_err,"can't use that engine\n");
-                        goto end;
-                        }
-                BIO_printf(bio_err,"engine \"%s\" set.\n", engine);
-                /* Free our "structural" reference. */
-                ENGINE_free(e);
-                }
+        e = setup_engine(bio_err, engine, 0);
 
         if (keyfile != NULL)
                 {
-                if (keyform == FORMAT_ENGINE)
-                        {
-                        if (!e)
-                                {
-                                BIO_printf(bio_err,"no engine specified\n");
-                                goto end;
-                                }
-                        pkey = ENGINE_load_private_key(e, keyfile, NULL);
-                        }
-                else
-                        {
-                        if (BIO_read_filename(in,keyfile) <= 0)
-                                {
-                                perror(keyfile);
-                                goto end;
-                                }
-
-                        if (keyform == FORMAT_ASN1)
-                                pkey=d2i_PrivateKey_bio(in,NULL);
-                        else if (keyform == FORMAT_PEM)
-                                {
-                                pkey=PEM_read_bio_PrivateKey(in,NULL,NULL,
-                                        passin);
-                                }
-                        else
-                                {
-                                BIO_printf(bio_err,"bad input format specified for X509 request\n");
-                                goto end;
-                                }
-                        }
-
-                if (pkey == NULL)
+                pkey = load_key(bio_err, keyfile, keyform, passin, e,
+                        "Private Key");
+                if (!pkey)
                         {
-                        BIO_printf(bio_err,"unable to load Private key\n");
+                        /* load_key() has already printed an appropriate
+                           message */
                         goto end;
                         }
-                if (EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA)
+                if (EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA)
                         {
-                        char *randfile = CONF_get_string(req_conf,SECTION,"RANDFILE");
+                        char *randfile = NCONF_get_string(req_conf,SECTION,"RANDFILE");
+                        if (randfile == NULL)
+                                ERR_clear_error();
                         app_RAND_load_file(randfile, bio_err, 0);
-                        }
+                        }
                 }
 
         if (newreq && (pkey == NULL))
                 {
-                char *randfile = CONF_get_string(req_conf,SECTION,"RANDFILE");
+                char *randfile = NCONF_get_string(req_conf,SECTION,"RANDFILE");
+                if (randfile == NULL)
+                        ERR_clear_error();
                 app_RAND_load_file(randfile, bio_err, 0);
                 if (inrand)
                         app_RAND_load_files(inrand);
         
                 if (newkey <= 0)
                         {
-                        newkey=(int)CONF_get_number(req_conf,SECTION,BITS);
-                        if (newkey <= 0)
+                        if (!NCONF_get_number(req_conf,SECTION,BITS, &newkey))
                                 newkey=DEFAULT_KEY_LENGTH;
                         }
 
@@ -619,7 +665,7 @@ bad:
 
                 if ((pkey=EVP_PKEY_new()) == NULL) goto end;
 
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
                 if (pkey_type == TYPE_RSA)
                         {
                         if (!EVP_PKEY_assign_RSA(pkey,
@@ -629,7 +675,7 @@ bad:
                         }
                 else
 #endif
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
                         if (pkey_type == TYPE_DSA)
                         {
                         if (!DSA_generate_key(dsa_params)) goto end;
@@ -643,13 +689,17 @@ bad:
                 if (pkey == NULL) goto end;
 
                 if (keyout == NULL)
-                        keyout=CONF_get_string(req_conf,SECTION,KEYFILE);
-
+                        {
+                        keyout=NCONF_get_string(req_conf,SECTION,KEYFILE);
+                        if (keyout == NULL)
+                                ERR_clear_error();
+                        }
+                
                 if (keyout == NULL)
                         {
                         BIO_printf(bio_err,"writing new private key to stdout\n");
                         BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef VMS
+#ifdef OPENSSL_SYS_VMS
                         {
                         BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                         out = BIO_push(tmpbio, out);
@@ -666,9 +716,14 @@ bad:
                                 }
                         }
 
-                p=CONF_get_string(req_conf,SECTION,"encrypt_rsa_key");
+                p=NCONF_get_string(req_conf,SECTION,"encrypt_rsa_key");
                 if (p == NULL)
-                        p=CONF_get_string(req_conf,SECTION,"encrypt_key");
+                        {
+                        ERR_clear_error();
+                        p=NCONF_get_string(req_conf,SECTION,"encrypt_key");
+                        if (p == NULL)
+                                ERR_clear_error();
+                        }
                 if ((p != NULL) && (strcmp(p,"no") == 0))
                         cipher=NULL;
                 if (nodes) cipher=NULL;
@@ -730,7 +785,7 @@ loop:
                         BIO_printf(bio_err,"you need to specify a private key\n");
                         goto end;
                         }
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
                 if (pkey->type == EVP_PKEY_DSA)
                         digest=EVP_dss1();
 #endif
@@ -742,9 +797,13 @@ loop:
                                 goto end;
                                 }
 
-                        i=make_REQ(req,pkey,!x509);
-                        if (kludge >= 0)
-                                req->req_info->req_kludge=kludge;
+                        i=make_REQ(req,pkey,subj,!x509, chtype);
+                        subj=NULL; /* done processing '-subj' option */
+                        if ((kludge > 0) && !sk_X509_ATTRIBUTE_num(req->req_info->attributes))
+                                {
+                                sk_X509_ATTRIBUTE_free(req->req_info->attributes);
+                                req->req_info->attributes = NULL;
+                                }
                         if (!i)
                                 {
                                 BIO_printf(bio_err,"problems making Certificate Request\n");
@@ -759,34 +818,38 @@ loop:
 
                         /* Set version to V3 */
                         if(!X509_set_version(x509ss, 2)) goto end;
-                        ASN1_INTEGER_set(X509_get_serialNumber(x509ss),0L);
-
-                        X509_set_issuer_name(x509ss,
-                                X509_REQ_get_subject_name(req));
-                        X509_gmtime_adj(X509_get_notBefore(x509ss),0);
-                        X509_gmtime_adj(X509_get_notAfter(x509ss),
-                                (long)60*60*24*days);
-                        X509_set_subject_name(x509ss,
-                                X509_REQ_get_subject_name(req));
+                        if (serial)
+                                {
+                                if (!X509_set_serialNumber(x509ss, serial)) goto end;
+                                }
+                        else
+                                {
+                                if (!ASN1_INTEGER_set(X509_get_serialNumber(x509ss),0L)) goto end;
+                                }
+
+                        if (!X509_set_issuer_name(x509ss, X509_REQ_get_subject_name(req))) goto end;
+                        if (!X509_gmtime_adj(X509_get_notBefore(x509ss),0)) goto end;
+                        if (!X509_gmtime_adj(X509_get_notAfter(x509ss), (long)60*60*24*days)) goto end;
+                        if (!X509_set_subject_name(x509ss, X509_REQ_get_subject_name(req))) goto end;
                         tmppkey = X509_REQ_get_pubkey(req);
-                        X509_set_pubkey(x509ss,tmppkey);
+                        if (!tmppkey || !X509_set_pubkey(x509ss,tmppkey)) goto end;
                         EVP_PKEY_free(tmppkey);
 
                         /* Set up V3 context struct */
 
                         X509V3_set_ctx(&ext_ctx, x509ss, x509ss, NULL, NULL, 0);
-                        X509V3_set_conf_lhash(&ext_ctx, req_conf);
+                        X509V3_set_nconf(&ext_ctx, req_conf);
 
                         /* Add extensions */
-                        if(extensions && !X509V3_EXT_add_conf(req_conf, 
+                        if(extensions && !X509V3_EXT_add_nconf(req_conf, 
                                         &ext_ctx, extensions, x509ss))
-                            {
-                            BIO_printf(bio_err,
-                                       "Error Loading extension section %s\n",
-                                       extensions);
-                            goto end;
-                            }
-
+                                {
+                                BIO_printf(bio_err,
+                                        "Error Loading extension section %s\n",
+                                        extensions);
+                                goto end;
+                                }
+                        
                         if (!(i=X509_sign(x509ss,pkey,digest)))
                                 goto end;
                         }
@@ -797,22 +860,51 @@ loop:
                         /* Set up V3 context struct */
 
                         X509V3_set_ctx(&ext_ctx, NULL, NULL, req, NULL, 0);
-                        X509V3_set_conf_lhash(&ext_ctx, req_conf);
+                        X509V3_set_nconf(&ext_ctx, req_conf);
 
                         /* Add extensions */
-                        if(req_exts && !X509V3_EXT_REQ_add_conf(req_conf, 
+                        if(req_exts && !X509V3_EXT_REQ_add_nconf(req_conf, 
                                         &ext_ctx, req_exts, req))
-                            {
-                            BIO_printf(bio_err,
-                                       "Error Loading extension section %s\n",
-                                       req_exts);
-                            goto end;
-                            }
+                                {
+                                BIO_printf(bio_err,
+                                        "Error Loading extension section %s\n",
+                                        req_exts);
+                                goto end;
+                                }
                         if (!(i=X509_REQ_sign(req,pkey,digest)))
                                 goto end;
                         }
                 }
 
+        if (subj && x509)
+                {
+                BIO_printf(bio_err, "Cannot modifiy certificate subject\n");
+                goto end;
+                }
+
+        if (subj && !x509)
+                {
+                if (verbose)
+                        {
+                        BIO_printf(bio_err, "Modifying Request's Subject\n");
+                        print_name(bio_err, "old subject=", X509_REQ_get_subject_name(req), nmflag);
+                        }
+
+                if (build_subject(req, subj, chtype) == 0)
+                        {
+                        BIO_printf(bio_err, "ERROR: cannot modify subject\n");
+                        ex=1;
+                        goto end;
+                        }
+
+                req->req_info->enc.modified = 1;
+
+                if (verbose)
+                        {
+                        print_name(bio_err, "new subject=", X509_REQ_get_subject_name(req), nmflag);
+                        }
+                }
+
         if (verify && !x509)
                 {
                 int tmp=0;
@@ -837,12 +929,13 @@ loop:
                 else if (i == 0)
                         {
                         BIO_printf(bio_err,"verify failure\n");
+                        ERR_print_errors(bio_err);
                         }
                 else /* if (i > 0) */
                         BIO_printf(bio_err,"verify OK\n");
                 }
 
-        if (noout && !text && !modulus)
+        if (noout && !text && !modulus && !subject && !pubkey)
                 {
                 ex=0;
                 goto end;
@@ -851,7 +944,7 @@ loop:
         if (outfile == NULL)
                 {
                 BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef VMS
+#ifdef OPENSSL_SYS_VMS
                 {
                 BIO *tmpbio = BIO_new(BIO_f_linebuffer());
                 out = BIO_push(tmpbio, out);
@@ -871,6 +964,20 @@ loop:
                         }
                 }
 
+        if (pubkey)
+                {
+                EVP_PKEY *tpubkey; 
+                tpubkey=X509_REQ_get_pubkey(req);
+                if (tpubkey == NULL)
+                        {
+                        BIO_printf(bio_err,"Error getting public key\n");
+                        ERR_print_errors(bio_err);
+                        goto end;
+                        }
+                PEM_write_bio_PUBKEY(out, tpubkey);
+                EVP_PKEY_free(tpubkey);
+                }
+
         if (text)
                 {
                 if (x509)
@@ -879,26 +986,35 @@ loop:
                         X509_REQ_print(out,req);
                 }
 
+        if(subject) 
+                {
+                if(x509)
+                        print_name(out, "subject=", X509_get_subject_name(x509ss), nmflag);
+                else
+                        print_name(out, "subject=", X509_REQ_get_subject_name(req), nmflag);
+                }
+
         if (modulus)
                 {
-                EVP_PKEY *pubkey;
+                EVP_PKEY *tpubkey;
 
                 if (x509)
-                        pubkey=X509_get_pubkey(x509ss);
+                        tpubkey=X509_get_pubkey(x509ss);
                 else
-                        pubkey=X509_REQ_get_pubkey(req);
-                if (pubkey == NULL)
+                        tpubkey=X509_REQ_get_pubkey(req);
+                if (tpubkey == NULL)
                         {
                         fprintf(stdout,"Modulus=unavailable\n");
                         goto end; 
                         }
                 fprintf(stdout,"Modulus=");
-#ifndef NO_RSA
-                if (pubkey->type == EVP_PKEY_RSA)
-                        BN_print(out,pubkey->pkey.rsa->n);
+#ifndef OPENSSL_NO_RSA
+                if (tpubkey->type == EVP_PKEY_RSA)
+                        BN_print(out,tpubkey->pkey.rsa->n);
                 else
 #endif
                         fprintf(stdout,"Wrong Algorithm type");
+                EVP_PKEY_free(tpubkey);
                 fprintf(stdout,"\n");
                 }
 
@@ -941,51 +1057,59 @@ end:
                 {
                 ERR_print_errors(bio_err);
                 }
-        if ((req_conf != NULL) && (req_conf != config)) CONF_free(req_conf);
+        if ((req_conf != NULL) && (req_conf != config)) NCONF_free(req_conf);
         BIO_free(in);
         BIO_free_all(out);
         EVP_PKEY_free(pkey);
         X509_REQ_free(req);
         X509_free(x509ss);
+        ASN1_INTEGER_free(serial);
         if(passargin && passin) OPENSSL_free(passin);
         if(passargout && passout) OPENSSL_free(passout);
         OBJ_cleanup();
-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
         if (dsa_params != NULL) DSA_free(dsa_params);
 #endif
+        apps_shutdown();
         EXIT(ex);
         }
 
-static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, int attribs)
+static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, char *subj, int attribs,
+                        unsigned long chtype)
         {
         int ret=0,i;
         char no_prompt = 0;
         STACK_OF(CONF_VALUE) *dn_sk, *attr_sk = NULL;
         char *tmp, *dn_sect,*attr_sect;
 
-        tmp=CONF_get_string(req_conf,SECTION,PROMPT);
+        tmp=NCONF_get_string(req_conf,SECTION,PROMPT);
+        if (tmp == NULL)
+                ERR_clear_error();
         if((tmp != NULL) && !strcmp(tmp, "no")) no_prompt = 1;
 
-        dn_sect=CONF_get_string(req_conf,SECTION,DISTINGUISHED_NAME);
+        dn_sect=NCONF_get_string(req_conf,SECTION,DISTINGUISHED_NAME);
         if (dn_sect == NULL)
                 {
                 BIO_printf(bio_err,"unable to find '%s' in config\n",
                         DISTINGUISHED_NAME);
                 goto err;
                 }
-        dn_sk=CONF_get_section(req_conf,dn_sect);
+        dn_sk=NCONF_get_section(req_conf,dn_sect);
         if (dn_sk == NULL)
                 {
                 BIO_printf(bio_err,"unable to get '%s' section\n",dn_sect);
                 goto err;
                 }
 
-        attr_sect=CONF_get_string(req_conf,SECTION,ATTRIBUTES);
+        attr_sect=NCONF_get_string(req_conf,SECTION,ATTRIBUTES);
         if (attr_sect == NULL)
+                {
+                ERR_clear_error();              
                 attr_sk=NULL;
+                }
         else
                 {
-                attr_sk=CONF_get_section(req_conf,attr_sect);
+                attr_sk=NCONF_get_section(req_conf,attr_sect);
                 if (attr_sk == NULL)
                         {
                         BIO_printf(bio_err,"unable to get '%s' section\n",attr_sect);
@@ -996,37 +1120,172 @@ static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, int attribs)
         /* setup version number */
         if (!X509_REQ_set_version(req,0L)) goto err; /* version 1 */
 
-        if(no_prompt) i = auto_info(req, dn_sk, attr_sk, attribs);
-        else i = prompt_info(req, dn_sk, dn_sect, attr_sk, attr_sect, attribs);
+        if (no_prompt) 
+                i = auto_info(req, dn_sk, attr_sk, attribs, chtype);
+        else 
+                {
+                if (subj)
+                        i = build_subject(req, subj, chtype);
+                else
+                        i = prompt_info(req, dn_sk, dn_sect, attr_sk, attr_sect, attribs, chtype);
+                }
         if(!i) goto err;
 
-        X509_REQ_set_pubkey(req,pkey);
+        if (!X509_REQ_set_pubkey(req,pkey)) goto err;
 
         ret=1;
 err:
         return(ret);
         }
 
+/*
+ * subject is expected to be in the format /type0=value0/type1=value1/type2=...
+ * where characters may be escaped by \
+ */
+static int build_subject(X509_REQ *req, char *subject, unsigned long chtype)
+        {
+        size_t buflen = strlen (subject)+1; /* to copy the types and values into. due to escaping, the copy can only become shorter */
+        char *buf = malloc (buflen);
+        size_t max_ne = buflen / 2 + 1; /* maximum number of name elements */
+        char **ne_types = malloc (max_ne * sizeof (char *));
+        char **ne_values = malloc (max_ne * sizeof (char *));
+
+        char *sp = subject, *bp = buf;
+        int i, ne_num = 0;
+
+        X509_NAME *n = NULL;
+        int nid;
+
+        if (!buf || !ne_types || !ne_values)
+        {
+                BIO_printf(bio_err, "malloc error\n");
+                goto error0;
+        }
+
+        if (*subject != '/')
+        {
+                BIO_printf(bio_err, "Subject does not start with '/'.\n");
+                goto error0;
+        }
+        sp++; /* skip leading / */
+
+        while (*sp)
+        {
+                /* collect type */
+                ne_types[ne_num] = bp;
+                while (*sp)
+                {
+                        if (*sp == '\\') /* is there anything to escape in the type...? */
+                                if (*++sp)
+                                        *bp++ = *sp++;
+                                else
+                                {
+                                        BIO_printf(bio_err, "escape character at end of string\n");
+                                        goto error0;
+                                }
+                        else if (*sp == '=')
+                        {
+                                sp++;
+                                *bp++ = '\0';
+                                break;
+                        }
+                        else
+                                *bp++ = *sp++;
+                }
+                if (!*sp)
+                {
+                        BIO_printf(bio_err, "end of string encountered while processing type of subject name element #%d\n", ne_num);
+                        goto error0;
+                }
+                ne_values[ne_num] = bp;
+                while (*sp)
+                {
+                        if (*sp == '\\')
+                                if (*++sp)
+                                        *bp++ = *sp++;
+                                else
+                                {
+                                        BIO_printf(bio_err, "escape character at end of string\n");
+                                        goto error0;
+                                }
+                        else if (*sp == '/')
+                        {
+                                sp++;
+                                *bp++ = '\0';
+                                break;
+                        }
+                        else
+                                *bp++ = *sp++;
+                }
+                *bp++ = '\0';
+                ne_num++;
+        }
+
+        if (!(n = X509_NAME_new()))
+                goto error0;
+
+        for(i = 0; i < ne_num; i++)
+                {
+                if ((nid=OBJ_txt2nid(ne_types[i])) == NID_undef)
+                        {
+                        BIO_printf(bio_err, "Subject Attribute %s has no known NID, skipped\n", ne_types[i]);
+                        continue;
+                        }
+
+                if (!*ne_values[i])
+                        {
+                        BIO_printf(bio_err, "No value provided for Subject Attribute %s, skipped\n", ne_types[i]);
+                        continue;
+                        }
+
+                if (!X509_NAME_add_entry_by_NID(n, nid, chtype, (unsigned char*)ne_values[i], -1,-1,0))
+                        goto error1;
+
+                }
+
+        if (!X509_REQ_set_subject_name(req, n))
+                goto error1;
+        X509_NAME_free(n);
+        free (ne_values);
+        free (ne_types);
+        free (buf);
+        return 1;
+
+error1:
+        X509_NAME_free(n);
+error0:
+        free (ne_values);
+        free (ne_types);
+        free (buf);
+        return 0;
+}
+
 
 static int prompt_info(X509_REQ *req,
                 STACK_OF(CONF_VALUE) *dn_sk, char *dn_sect,
-                STACK_OF(CONF_VALUE) *attr_sk, char *attr_sect, int attribs)
+                STACK_OF(CONF_VALUE) *attr_sk, char *attr_sect, int attribs,
+                unsigned long chtype)
         {
         int i;
         char *p,*q;
         char buf[100];
-        int nid,min,max;
+        int nid;
+        long n_min,n_max;
         char *type,*def,*value;
         CONF_VALUE *v;
         X509_NAME *subj;
         subj = X509_REQ_get_subject_name(req);
-        BIO_printf(bio_err,"You are about to be asked to enter information that will be incorporated\n");
-        BIO_printf(bio_err,"into your certificate request.\n");
-        BIO_printf(bio_err,"What you are about to enter is what is called a Distinguished Name or a DN.\n");
-        BIO_printf(bio_err,"There are quite a few fields but you can leave some blank\n");
-        BIO_printf(bio_err,"For some fields there will be a default value,\n");
-        BIO_printf(bio_err,"If you enter '.', the field will be left blank.\n");
-        BIO_printf(bio_err,"-----\n");
+
+        if(!batch)
+                {
+                BIO_printf(bio_err,"You are about to be asked to enter information that will be incorporated\n");
+                BIO_printf(bio_err,"into your certificate request.\n");
+                BIO_printf(bio_err,"What you are about to enter is what is called a Distinguished Name or a DN.\n");
+                BIO_printf(bio_err,"There are quite a few fields but you can leave some blank\n");
+                BIO_printf(bio_err,"For some fields there will be a default value,\n");
+                BIO_printf(bio_err,"If you enter '.', the field will be left blank.\n");
+                BIO_printf(bio_err,"-----\n");
+                }
 
 
         if (sk_CONF_VALUE_num(dn_sk))
@@ -1056,21 +1315,29 @@ start:		for (;;)
                         /* If OBJ not recognised ignore it */
                         if ((nid=OBJ_txt2nid(type)) == NID_undef) goto start;
                         sprintf(buf,"%s_default",v->name);
-                        if ((def=CONF_get_string(req_conf,dn_sect,buf)) == NULL)
+                        if ((def=NCONF_get_string(req_conf,dn_sect,buf)) == NULL)
+                                {
+                                ERR_clear_error();
                                 def="";
+                                }
                                 
                         sprintf(buf,"%s_value",v->name);
-                        if ((value=CONF_get_string(req_conf,dn_sect,buf)) == NULL)
+                        if ((value=NCONF_get_string(req_conf,dn_sect,buf)) == NULL)
+                                {
+                                ERR_clear_error();
                                 value=NULL;
+                                }
 
                         sprintf(buf,"%s_min",v->name);
-                        min=(int)CONF_get_number(req_conf,dn_sect,buf);
+                        if (!NCONF_get_number(req_conf,dn_sect,buf, &n_min))
+                                n_min = -1;
 
                         sprintf(buf,"%s_max",v->name);
-                        max=(int)CONF_get_number(req_conf,dn_sect,buf);
+                        if (!NCONF_get_number(req_conf,dn_sect,buf, &n_max))
+                                n_max = -1;
 
                         if (!add_DN_object(subj,v->value,def,value,nid,
-                                min,max))
+                                n_min,n_max, chtype))
                                 return 0;
                         }
                 if (X509_NAME_entry_count(subj) == 0)
@@ -1081,7 +1348,7 @@ start:		for (;;)
 
                 if (attribs)
                         {
-                        if ((attr_sk != NULL) && (sk_CONF_VALUE_num(attr_sk) > 0))
+                        if ((attr_sk != NULL) && (sk_CONF_VALUE_num(attr_sk) > 0) && (!batch))
                                 {
                                 BIO_printf(bio_err,"\nPlease enter the following 'extra' attributes\n");
                                 BIO_printf(bio_err,"to be sent with your certificate request\n");
@@ -1101,23 +1368,32 @@ start2:			for (;;)
                                         goto start2;
 
                                 sprintf(buf,"%s_default",type);
-                                if ((def=CONF_get_string(req_conf,attr_sect,buf))
+                                if ((def=NCONF_get_string(req_conf,attr_sect,buf))
                                         == NULL)
+                                        {
+                                        ERR_clear_error();
                                         def="";
+                                        }
+                                
                                 
                                 sprintf(buf,"%s_value",type);
-                                if ((value=CONF_get_string(req_conf,attr_sect,buf))
+                                if ((value=NCONF_get_string(req_conf,attr_sect,buf))
                                         == NULL)
+                                        {
+                                        ERR_clear_error();
                                         value=NULL;
+                                        }
 
                                 sprintf(buf,"%s_min",type);
-                                min=(int)CONF_get_number(req_conf,attr_sect,buf);
+                                if (!NCONF_get_number(req_conf,attr_sect,buf, &n_min))
+                                        n_min = -1;
 
                                 sprintf(buf,"%s_max",type);
-                                max=(int)CONF_get_number(req_conf,attr_sect,buf);
+                                if (!NCONF_get_number(req_conf,attr_sect,buf, &n_max))
+                                        n_max = -1;
 
                                 if (!add_attribute_object(req,
-                                        v->value,def,value,nid,min,max))
+                                        v->value,def,value,nid,n_min,n_max, chtype))
                                         return 0;
                                 }
                         }
@@ -1133,7 +1409,7 @@ start2:			for (;;)
         }
 
 static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
-                        STACK_OF(CONF_VALUE) *attr_sk, int attribs)
+                        STACK_OF(CONF_VALUE) *attr_sk, int attribs, unsigned long chtype)
         {
         int i;
         char *p,*q;
@@ -1161,7 +1437,7 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
                                 if(*p) type = p;
                                 break;
                         }
-                if (!X509_NAME_add_entry_by_txt(subj,type, MBSTRING_ASC,
+                if (!X509_NAME_add_entry_by_txt(subj,type, chtype,
                                 (unsigned char *) v->value,-1,-1,0)) return 0;
 
                 }
@@ -1176,7 +1452,7 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
                         for (i = 0; i < sk_CONF_VALUE_num(attr_sk); i++)
                                 {
                                 v=sk_CONF_VALUE_value(attr_sk,i);
-                                if(!X509_REQ_add1_attr_by_txt(req, v->name, MBSTRING_ASC,
+                                if(!X509_REQ_add1_attr_by_txt(req, v->name, chtype,
                                         (unsigned char *)v->value, -1)) return 0;
                                 }
                         }
@@ -1185,14 +1461,14 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
 
 
 static int add_DN_object(X509_NAME *n, char *text, char *def, char *value,
-             int nid, int min, int max)
+             int nid, int n_min, int n_max, unsigned long chtype)
         {
         int i,ret=0;
         MS_STATIC char buf[1024];
 start:
-        BIO_printf(bio_err,"%s [%s]:",text,def);
+        if (!batch) BIO_printf(bio_err,"%s [%s]:",text,def);
         (void)BIO_flush(bio_err);
-        if (value != NULL)
+        if(value != NULL)
                 {
                 strcpy(buf,value);
                 strcat(buf,"\n");
@@ -1201,7 +1477,15 @@ start:
         else
                 {
                 buf[0]='\0';
-                fgets(buf,1024,stdin);
+                if (!batch)
+                        {
+                        fgets(buf,1024,stdin);
+                        }
+                else
+                        {
+                        buf[0] = '\n';
+                        buf[1] = '\0';
+                        }
                 }
 
         if (buf[0] == '\0') return(0);
@@ -1221,12 +1505,11 @@ start:
                 return(0);
                 }
         buf[--i]='\0';
-
 #ifdef CHARSET_EBCDIC
         ebcdic2ascii(buf, buf, i);
 #endif
-        if(!req_check_len(i, min, max)) goto start;
-        if (!X509_NAME_add_entry_by_NID(n,nid, MBSTRING_ASC,
+        if(!req_check_len(i, n_min, n_max)) goto start;
+        if (!X509_NAME_add_entry_by_NID(n,nid, chtype,
                                 (unsigned char *) buf, -1,-1,0)) goto err;
         ret=1;
 err:
@@ -1234,14 +1517,14 @@ err:
         }
 
 static int add_attribute_object(X509_REQ *req, char *text,
-                                char *def, char *value, int nid, int min,
-                                int max)
+                                char *def, char *value, int nid, int n_min,
+                                int n_max, unsigned long chtype)
         {
         int i;
         static char buf[1024];
 
 start:
-        BIO_printf(bio_err,"%s [%s]:",text,def);
+        if (!batch) BIO_printf(bio_err,"%s [%s]:",text,def);
         (void)BIO_flush(bio_err);
         if (value != NULL)
                 {
@@ -1252,7 +1535,15 @@ start:
         else
                 {
                 buf[0]='\0';
-                fgets(buf,1024,stdin);
+                if (!batch)
+                        {
+                        fgets(buf,1024,stdin);
+                        }
+                else
+                        {
+                        buf[0] = '\n';
+                        buf[1] = '\0';
+                        }
                 }
 
         if (buf[0] == '\0') return(0);
@@ -1275,9 +1566,9 @@ start:
 #ifdef CHARSET_EBCDIC
         ebcdic2ascii(buf, buf, i);
 #endif
-        if(!req_check_len(i, min, max)) goto start;
+        if(!req_check_len(i, n_min, n_max)) goto start;
 
-        if(!X509_REQ_add1_attr_by_NID(req, nid, MBSTRING_ASC,
+        if(!X509_REQ_add1_attr_by_NID(req, nid, chtype,
                                         (unsigned char *)buf, -1)) {
                 BIO_printf(bio_err, "Error adding attribute\n");
                 ERR_print_errors(bio_err);
@@ -1289,7 +1580,7 @@ err:
         return(0);
         }
 
-#ifndef NO_RSA
+#ifndef OPENSSL_NO_RSA
 static void MS_CALLBACK req_cb(int p, int n, void *arg)
         {
         char c='*';
@@ -1306,16 +1597,16 @@ static void MS_CALLBACK req_cb(int p, int n, void *arg)
         }
 #endif
 
-static int req_check_len(int len, int min, int max)
+static int req_check_len(int len, int n_min, int n_max)
         {
-        if (len < min)
+        if ((n_min > 0) && (len < n_min))
                 {
-                BIO_printf(bio_err,"string is too short, it needs to be at least %d bytes long\n",min);
+                BIO_printf(bio_err,"string is too short, it needs to be at least %d bytes long\n",n_min);
                 return(0);
                 }
-        if ((max != 0) && (len > max))
+        if ((n_max >= 0) && (len > n_max))
                 {
-                BIO_printf(bio_err,"string is too long, it needs to be less than  %d bytes long\n",max);
+                BIO_printf(bio_err,"string is too long, it needs to be less than  %d bytes long\n",n_max);
                 return(0);
                 }
         return(1);