Upgrade chrome's OpenSSL to same version Android ships with.

openssl/apps/apps.c

 /* apps/apps.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 91 matching lines @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ====================================================================
  *
  * This product includes cryptographic software written by Eric Young
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com).
  *
  */
 
+#ifndef _POSIX_C_SOURCE
+#define _POSIX_C_SOURCE 2       /* On VMS, you need to define this to get
+                                   the declaration of fileno().  The value
+                                   2 is to make sure no function defined
+                                   in POSIX-2 is left undefined. */
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#if !defined(OPENSSL_SYSNAME_WIN32) && !defined(NETWARE_CLIB)
+#include <strings.h>
+#endif
 #include <sys/types.h>
-#include <sys/stat.h>
 #include <ctype.h>
+#include <errno.h>
 #include <assert.h>
 #include <openssl/err.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include <openssl/pem.h>
 #include <openssl/pkcs12.h>
 #include <openssl/ui.h>
 #include <openssl/safestack.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
 #ifndef OPENSSL_NO_RSA
 #include <openssl/rsa.h>
 #endif
 #include <openssl/bn.h>
 #ifndef OPENSSL_NO_JPAKE
 #include <openssl/jpake.h>
 #endif
 
 #define NON_MAIN
 #include "apps.h"
 #undef NON_MAIN
 
+#ifdef _WIN32
+static int WIN32_rename(const char *from, const char *to);
+#define rename(from,to) WIN32_rename((from),(to))
+#endif
+
 typedef struct {
         const char *name;
         unsigned long flag;
         unsigned long mask;
 } NAME_EX_TBL;
 
 static UI_METHOD *ui_method = NULL;
 
 static int set_table_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl);
 static int set_multi_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl);
 
 #if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
 /* Looks like this stuff is worth moving into separate function */
 static EVP_PKEY *
 load_netscape_key(BIO *err, BIO *key, const char *file,
                 const char *key_descrip, int format);
 #endif
 
 int app_init(long mesgwin);
 #ifdef undef /* never finished - probably never will be :-) */
 int args_from_file(char *file, int *argc, char **argv[])
         {
         FILE *fp;
         int num,i;
         unsigned int len;
         static char *buf=NULL;
         static char **arg=NULL;
         char *p;
-        struct stat stbuf;
-
-        if (stat(file,&stbuf) < 0) return(0);
 
         fp=fopen(file,"r");
         if (fp == NULL)
                 return(0);
 
+        if (fseek(fp,0,SEEK_END)==0)
+                len=ftell(fp), rewind(fp);
+        else    len=-1;
+        if (len<=0)
+                {
+                fclose(fp);
+                return(0);
+                }
+
         *argc=0;
         *argv=NULL;
 
-        len=(unsigned int)stbuf.st_size;
         if (buf != NULL) OPENSSL_free(buf);
         buf=(char *)OPENSSL_malloc(len+1);
         if (buf == NULL) return(0);
 
         len=fread(buf,1,len,fp);
         if (len <= 1) return(0);
         buf[len]='\0';
 
         i=0;
         for (p=buf; *p; p++)
@@ skipping 40 matching lines @@
                 /* else *p == '\n' */
                 *(p++)='\0';
                 }
         *argc=num;
         return(1);
         }
 #endif
 
 int str2fmt(char *s)
         {
+        if (s == NULL)
+                return FORMAT_UNDEF;
         if      ((*s == 'D') || (*s == 'd'))
                 return(FORMAT_ASN1);
         else if ((*s == 'T') || (*s == 't'))
                 return(FORMAT_TEXT);
-        else if ((*s == 'P') || (*s == 'p'))
-                return(FORMAT_PEM);
-        else if ((*s == 'N') || (*s == 'n'))
-                return(FORMAT_NETSCAPE);
-        else if ((*s == 'S') || (*s == 's'))
-                return(FORMAT_SMIME);
+        else if ((*s == 'N') || (*s == 'n'))
+                return(FORMAT_NETSCAPE);
+        else if ((*s == 'S') || (*s == 's'))
+                return(FORMAT_SMIME);
+        else if ((*s == 'M') || (*s == 'm'))
+                return(FORMAT_MSBLOB);
         else if ((*s == '1')
                 || (strcmp(s,"PKCS12") == 0) || (strcmp(s,"pkcs12") == 0)
                 || (strcmp(s,"P12") == 0) || (strcmp(s,"p12") == 0))
                 return(FORMAT_PKCS12);
         else if ((*s == 'E') || (*s == 'e'))
                 return(FORMAT_ENGINE);
+        else if ((*s == 'P') || (*s == 'p'))
+                {
+                if (s[1] == 'V' || s[1] == 'v')
+                        return FORMAT_PVK;
+                else
+                        return(FORMAT_PEM);
+                }
         else
                 return(FORMAT_UNDEF);
         }
 
 #if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_NETWARE)
 void program_name(char *in, char *out, int size)
         {
         int i,n;
         char *p=NULL;
 
@@ skipping 77 matching lines @@
                 p++;
         else
                 p=in;
         BUF_strlcpy(out,p,size);
         }
 #endif
 #endif
 
 int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[])
         {
-        int num,len,i;
+        int num,i;
         char *p;
 
         *argc=0;
         *argv=NULL;
 
-        len=strlen(buf);
         i=0;
         if (arg->count == 0)
                 {
                 arg->count=20;
                 arg->data=(char **)OPENSSL_malloc(sizeof(char *)*arg->count);
                 }
         for (i=0; i<arg->count; i++)
                 arg->data[i]=NULL;
 
         num=0;
@@ skipping 261 matching lines @@
                 }
                 return BUF_strdup(tmp);
         }
         if(!keepbio || !pwdbio) {
                 if(!strncmp(arg, "file:", 5)) {
                         pwdbio = BIO_new_file(arg + 5, "r");
                         if(!pwdbio) {
                                 BIO_printf(err, "Can't open file %s\n", arg + 5);
                                 return NULL;
                         }
+#if !defined(_WIN32)
+                /*
+                 * Under _WIN32, which covers even Win64 and CE, file
+                 * descriptors referenced by BIO_s_fd are not inherited
+                 * by child process and therefore below is not an option.
+                 * It could have been an option if bss_fd.c was operating
+                 * on real Windows descriptors, such as those obtained
+                 * with CreateFile.
+                 */
                 } else if(!strncmp(arg, "fd:", 3)) {
                         BIO *btmp;
                         i = atoi(arg + 3);
                         if(i >= 0) pwdbio = BIO_new_fd(i, BIO_NOCLOSE);
                         if((i < 0) || !pwdbio) {
                                 BIO_printf(err, "Can't access file descriptor %s\n", arg + 3);
                                 return NULL;
                         }
                         /* Can't do BIO_gets on an fd BIO so add a buffering BIO */
                         btmp = BIO_new(BIO_f_buffer());
                         pwdbio = BIO_push(btmp, pwdbio);
+#endif
                 } else if(!strcmp(arg, "stdin")) {
                         pwdbio = BIO_new_fp(stdin, BIO_NOCLOSE);
                         if(!pwdbio) {
                                 BIO_printf(err, "Can't open BIO for stdin\n");
                                 return NULL;
                         }
                 } else {
                         BIO_printf(err, "Invalid password argument \"%s\"\n", arg);
                         return NULL;
                 }
@@ skipping 79 matching lines @@
         ret = PKCS12_parse(p12, pass, pkey, cert, ca);
         die:
         if (p12)
                 PKCS12_free(p12);
         return ret;
         }
 
 X509 *load_cert(BIO *err, const char *file, int format,
         const char *pass, ENGINE *e, const char *cert_descrip)
         {
-        ASN1_HEADER *ah=NULL;
-        BUF_MEM *buf=NULL;
         X509 *x=NULL;
         BIO *cert;
 
         if ((cert=BIO_new(BIO_s_file())) == NULL)
                 {
                 ERR_print_errors(err);
                 goto end;
                 }
 
         if (file == NULL)
                 {
+#ifdef _IONBF
+# ifndef OPENSSL_NO_SETVBUF_IONBF
                 setvbuf(stdin, NULL, _IONBF, 0);
+# endif /* ndef OPENSSL_NO_SETVBUF_IONBF */
+#endif
                 BIO_set_fp(cert,stdin,BIO_NOCLOSE);
                 }
         else
                 {
                 if (BIO_read_filename(cert,file) <= 0)
                         {
                         BIO_printf(err, "Error opening %s %s\n",
                                 cert_descrip, file);
                         ERR_print_errors(err);
                         goto end;
                         }
                 }
 
         if      (format == FORMAT_ASN1)
                 x=d2i_X509_bio(cert,NULL);
         else if (format == FORMAT_NETSCAPE)
                 {
-                const unsigned char *p,*op;
-                int size=0,i;
+                NETSCAPE_X509 *nx;
+                nx=ASN1_item_d2i_bio(ASN1_ITEM_rptr(NETSCAPE_X509),cert,NULL);
+                if (nx == NULL)
+                                goto end;
 
-                /* We sort of have to do it this way because it is sort of nice
-                 * to read the header first and check it, then
-                 * try to read the certificate */
-                buf=BUF_MEM_new();
-                for (;;)
+                if ((strncmp(NETSCAPE_CERT_HDR,(char *)nx->header->data,
+                        nx->header->length) != 0))
                         {
-                        if ((buf == NULL) || (!BUF_MEM_grow(buf,size+1024*10)))
-                                goto end;
-                        i=BIO_read(cert,&(buf->data[size]),1024*10);
-                        size+=i;
-                        if (i == 0) break;
-                        if (i < 0)
-                                {
-                                perror("reading certificate");
-                                goto end;
-                                }
-                        }
-                p=(unsigned char *)buf->data;
-                op=p;
-
-                /* First load the header */
-                if ((ah=d2i_ASN1_HEADER(NULL,&p,(long)size)) == NULL)
-                        goto end;
-                if ((ah->header == NULL) || (ah->header->data == NULL) ||
-                        (strncmp(NETSCAPE_CERT_HDR,(char *)ah->header->data,
-                        ah->header->length) != 0))
-                        {
+                        NETSCAPE_X509_free(nx);
                         BIO_printf(err,"Error reading header on certificate\n");
                         goto end;
                         }
-                /* header is ok, so now read the object */
-                p=op;
-                ah->meth=X509_asn1_meth();
-                if ((ah=d2i_ASN1_HEADER(&ah,&p,(long)size)) == NULL)
-                        goto end;
-                x=(X509 *)ah->data;
-                ah->data=NULL;
+                x=nx->cert;
+                nx->cert = NULL;
+                NETSCAPE_X509_free(nx);
                 }
         else if (format == FORMAT_PEM)
                 x=PEM_read_bio_X509_AUX(cert,NULL,
                         (pem_password_cb *)password_callback, NULL);
         else if (format == FORMAT_PKCS12)
                 {
                 if (!load_pkcs12(err, cert,cert_descrip, NULL, NULL,
                                         NULL, &x, NULL))
                         goto end;
                 }
         else    {
                 BIO_printf(err,"bad input format specified for %s\n",
                         cert_descrip);
                 goto end;
                 }
 end:
         if (x == NULL)
                 {
                 BIO_printf(err,"unable to load certificate\n");
                 ERR_print_errors(err);
                 }
-        if (ah != NULL) ASN1_HEADER_free(ah);
         if (cert != NULL) BIO_free(cert);
-        if (buf != NULL) BUF_MEM_free(buf);
         return(x);
         }
 
 EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
         const char *pass, ENGINE *e, const char *key_descrip)
         {
         BIO *key=NULL;
         EVP_PKEY *pkey=NULL;
         PW_CB_DATA cb_data;
 
@@ skipping 24 matching lines @@
                 }
 #endif
         key=BIO_new(BIO_s_file());
         if (key == NULL)
                 {
                 ERR_print_errors(err);
                 goto end;
                 }
         if (file == NULL && maybe_stdin)
                 {
+#ifdef _IONBF
+# ifndef OPENSSL_NO_SETVBUF_IONBF
                 setvbuf(stdin, NULL, _IONBF, 0);
+# endif /* ndef OPENSSL_NO_SETVBUF_IONBF */
+#endif
                 BIO_set_fp(key,stdin,BIO_NOCLOSE);
                 }
         else
                 if (BIO_read_filename(key,file) <= 0)
                         {
                         BIO_printf(err, "Error opening %s %s\n",
                                 key_descrip, file);
                         ERR_print_errors(err);
                         goto end;
                         }
@@ skipping 10 matching lines @@
         else if (format == FORMAT_NETSCAPE || format == FORMAT_IISSGC)
                 pkey = load_netscape_key(err, key, file, key_descrip, format);
 #endif
         else if (format == FORMAT_PKCS12)
                 {
                 if (!load_pkcs12(err, key, key_descrip,
                                 (pem_password_cb *)password_callback, &cb_data,
                                 &pkey, NULL, NULL))
                         goto end;
                 }
+#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA) && !defined (OPENSSL_NO_RC4)
+        else if (format == FORMAT_MSBLOB)
+                pkey = b2i_PrivateKey_bio(key);
+        else if (format == FORMAT_PVK)
+                pkey = b2i_PVK_bio(key, (pem_password_cb *)password_callback,
+                                                                &cb_data);
+#endif
         else
                 {
                 BIO_printf(err,"bad input format specified for key file\n");
                 goto end;
                 }
  end:
         if (key != NULL) BIO_free(key);
         if (pkey == NULL) 
                 {
                 BIO_printf(err,"unable to load %s\n", key_descrip);
@@ skipping 29 matching lines @@
                 }
 #endif
         key=BIO_new(BIO_s_file());
         if (key == NULL)
                 {
                 ERR_print_errors(err);
                 goto end;
                 }
         if (file == NULL && maybe_stdin)
                 {
+#ifdef _IONBF
+# ifndef OPENSSL_NO_SETVBUF_IONBF
                 setvbuf(stdin, NULL, _IONBF, 0);
+# endif /* ndef OPENSSL_NO_SETVBUF_IONBF */
+#endif
                 BIO_set_fp(key,stdin,BIO_NOCLOSE);
                 }
         else
                 if (BIO_read_filename(key,file) <= 0)
                         {
                         BIO_printf(err, "Error opening %s %s\n",
                                 key_descrip, file);
                         ERR_print_errors(err);
                         goto end;
                 }
         if (format == FORMAT_ASN1)
                 {
                 pkey=d2i_PUBKEY_bio(key, NULL);
                 }
+#ifndef OPENSSL_NO_RSA
+        else if (format == FORMAT_ASN1RSA)
+                {
+                RSA *rsa;
+                rsa = d2i_RSAPublicKey_bio(key, NULL);
+                if (rsa)
+                        {
+                        pkey = EVP_PKEY_new();
+                        if (pkey)
+                                EVP_PKEY_set1_RSA(pkey, rsa);
+                        RSA_free(rsa);
+                        }
+                else
+                        pkey = NULL;
+                }
+        else if (format == FORMAT_PEMRSA)
+                {
+                RSA *rsa;
+                rsa = PEM_read_bio_RSAPublicKey(key, NULL, 
+                        (pem_password_cb *)password_callback, &cb_data);
+                if (rsa)
+                        {
+                        pkey = EVP_PKEY_new();
+                        if (pkey)
+                                EVP_PKEY_set1_RSA(pkey, rsa);
+                        RSA_free(rsa);
+                        }
+                else
+                        pkey = NULL;
+                }
+#endif
         else if (format == FORMAT_PEM)
                 {
                 pkey=PEM_read_bio_PUBKEY(key,NULL,
                         (pem_password_cb *)password_callback, &cb_data);
                 }
 #if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
         else if (format == FORMAT_NETSCAPE || format == FORMAT_IISSGC)
                 pkey = load_netscape_key(err, key, file, key_descrip, format);
 #endif
+#if !defined(OPENSSL_NO_RSA) && !defined(OPENSSL_NO_DSA)
+        else if (format == FORMAT_MSBLOB)
+                pkey = b2i_PublicKey_bio(key);
+#endif
         else
                 {
                 BIO_printf(err,"bad input format specified for key file\n");
                 goto end;
                 }
  end:
         if (key != NULL) BIO_free(key);
         if (pkey == NULL)
                 BIO_printf(err,"unable to load %s\n", key_descrip);
         return(pkey);
@@ skipping 38 matching lines @@
         BUF_MEM_free(buf);
         EVP_PKEY_set1_RSA(pkey, rsa);
         return pkey;
 error:
         BUF_MEM_free(buf);
         EVP_PKEY_free(pkey);
         return NULL;
         }
 #endif /* ndef OPENSSL_NO_RC4 */
 
-STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
-        const char *pass, ENGINE *e, const char *cert_descrip)
+static int load_certs_crls(BIO *err, const char *file, int format,
+        const char *pass, ENGINE *e, const char *desc,
+        STACK_OF(X509) **pcerts, STACK_OF(X509_CRL) **pcrls)
         {
-        BIO *certs;
         int i;
-        STACK_OF(X509) *othercerts = NULL;
-        STACK_OF(X509_INFO) *allcerts = NULL;
+        BIO *bio;
+        STACK_OF(X509_INFO) *xis = NULL;
         X509_INFO *xi;
         PW_CB_DATA cb_data;
+        int rv = 0;
 
         cb_data.password = pass;
         cb_data.prompt_info = file;
 
-        if((certs = BIO_new(BIO_s_file())) == NULL)
+        if (format != FORMAT_PEM)
                 {
-                ERR_print_errors(err);
-                goto end;
+                BIO_printf(err,"bad input format specified for %s\n", desc);
+                return 0;
                 }
 
         if (file == NULL)
-                BIO_set_fp(certs,stdin,BIO_NOCLOSE);
+                bio = BIO_new_fp(stdin,BIO_NOCLOSE);
         else
+                bio = BIO_new_file(file, "r");
+
+        if (bio == NULL)
                 {
-                if (BIO_read_filename(certs,file) <= 0)
+                BIO_printf(err, "Error opening %s %s\n",
+                                desc, file ? file : "stdin");
+                ERR_print_errors(err);
+                return 0;
+                }
+
+        xis = PEM_X509_INFO_read_bio(bio, NULL,
+                                (pem_password_cb *)password_callback, &cb_data);
+
+        BIO_free(bio);
+
+        if (pcerts)
+                {
+                *pcerts = sk_X509_new_null();
+                if (!*pcerts)
+                        goto end;
+                }
+
+        if (pcrls)
+                {
+                *pcrls = sk_X509_CRL_new_null();
+                if (!*pcrls)
+                        goto end;
+                }
+
+        for(i = 0; i < sk_X509_INFO_num(xis); i++)
+                {
+                xi = sk_X509_INFO_value (xis, i);
+                if (xi->x509 && pcerts)
                         {
-                        BIO_printf(err, "Error opening %s %s\n",
-                                cert_descrip, file);
-                        ERR_print_errors(err);
-                        goto end;
+                        if (!sk_X509_push(*pcerts, xi->x509))
+                                goto end;
+                        xi->x509 = NULL;
+                        }
+                if (xi->crl && pcrls)
+                        {
+                        if (!sk_X509_CRL_push(*pcrls, xi->crl))
+                                goto end;
+                        xi->crl = NULL;
                         }
                 }
 
-        if      (format == FORMAT_PEM)
+        if (pcerts && sk_X509_num(*pcerts) > 0)
+                rv = 1;
+
+        if (pcrls && sk_X509_CRL_num(*pcrls) > 0)
+                rv = 1;
+
+        end:
+
+        if (xis)
+                sk_X509_INFO_pop_free(xis, X509_INFO_free);
+
+        if (rv == 0)
                 {
-                othercerts = sk_X509_new_null();
-                if(!othercerts)
+                if (pcerts)
                         {
-                        sk_X509_free(othercerts);
-                        othercerts = NULL;
-                        goto end;
+                        sk_X509_pop_free(*pcerts, X509_free);
+                        *pcerts = NULL;
                         }
-                allcerts = PEM_X509_INFO_read_bio(certs, NULL,
-                                (pem_password_cb *)password_callback, &cb_data);
-                for(i = 0; i < sk_X509_INFO_num(allcerts); i++)
+                if (pcrls)
                         {
-                        xi = sk_X509_INFO_value (allcerts, i);
-                        if (xi->x509)
-                                {
-                                sk_X509_push(othercerts, xi->x509);
-                                xi->x509 = NULL;
-                                }
+                        sk_X509_CRL_pop_free(*pcrls, X509_CRL_free);
+                        *pcrls = NULL;
                         }
-                goto end;
-                }
-        else    {
-                BIO_printf(err,"bad input format specified for %s\n",
-                        cert_descrip);
-                goto end;
-                }
-end:
-        if (othercerts == NULL)
-                {
-                BIO_printf(err,"unable to load certificates\n");
+                BIO_printf(err,"unable to load %s\n",
+                                pcerts ? "certificates" : "CRLs");
                 ERR_print_errors(err);
                 }
-        if (allcerts) sk_X509_INFO_pop_free(allcerts, X509_INFO_free);
-        if (certs != NULL) BIO_free(certs);
-        return(othercerts);
+        return rv;
         }
 
+STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
+        const char *pass, ENGINE *e, const char *desc)
+        {
+        STACK_OF(X509) *certs;
+        load_certs_crls(err, file, format, pass, e, desc, &certs, NULL);
+        return certs;
+        }       
+
+STACK_OF(X509_CRL) *load_crls(BIO *err, const char *file, int format,
+        const char *pass, ENGINE *e, const char *desc)
+        {
+        STACK_OF(X509_CRL) *crls;
+        load_certs_crls(err, file, format, pass, e, desc, NULL, &crls);
+        return crls;
+        }       
 
 #define X509V3_EXT_UNKNOWN_MASK         (0xfL << 16)
 /* Return error for unknown extensions */
 #define X509V3_EXT_DEFAULT              0
 /* Print error for unknown extensions */
 #define X509V3_EXT_ERROR_UNKNOWN        (1L << 16)
 /* ASN1 parse unknown extensions */
 #define X509V3_EXT_PARSE_UNKNOWN        (2L << 16)
 /* BIO_dump unknown extensions */
 #define X509V3_EXT_DUMP_UNKNOWN         (3L << 16)
@@ skipping 266 matching lines @@
 
                 /* Free our "structural" reference. */
                 ENGINE_free(e);
                 }
         return e;
         }
 #endif
 
 int load_config(BIO *err, CONF *cnf)
         {
+        static int load_config_called = 0;
+        if (load_config_called)
+                return 1;
+        load_config_called = 1;
         if (!cnf)
                 cnf = config;
         if (!cnf)
                 return 1;
 
         OPENSSL_load_builtin_modules();
 
         if (CONF_modules_load(cnf, NULL, 0) <= 0)
                 {
                 BIO_printf(err, "Error configuring OpenSSL\n");
@@ skipping 13 matching lines @@
         p=OPENSSL_malloc(len);
         BUF_strlcpy(p,t,len);
 #ifndef OPENSSL_SYS_VMS
         BUF_strlcat(p,"/",len);
 #endif
         BUF_strlcat(p,OPENSSL_CONF,len);
 
         return p;
         }
 
-static unsigned long index_serial_hash(const char **a)
+static unsigned long index_serial_hash(const OPENSSL_CSTRING *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)
+static int index_serial_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *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 int index_name_qual(char **a)
         { return(a[0][0] == 'V'); }
 
-static unsigned long index_name_hash(const char **a)
+static unsigned long index_name_hash(const OPENSSL_CSTRING *a)
         { return(lh_strhash(a[DB_name])); }
 
-int index_name_cmp(const char **a, const char **b)
-        { return(strcmp(a[DB_name],
-             b[DB_name])); }
+int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b)
+        { return(strcmp(a[DB_name], b[DB_name])); }
 
-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 **)
+static IMPLEMENT_LHASH_HASH_FN(index_serial, OPENSSL_CSTRING)
+static IMPLEMENT_LHASH_COMP_FN(index_serial, OPENSSL_CSTRING)
+static IMPLEMENT_LHASH_HASH_FN(index_name, OPENSSL_CSTRING)
+static IMPLEMENT_LHASH_COMP_FN(index_name, OPENSSL_CSTRING)
 
 #undef BSIZE
 #define BSIZE 256
 
 BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai)
         {
         BIO *in=NULL;
         BIGNUM *ret=NULL;
         MS_STATIC char buf[1024];
         ASN1_INTEGER *ai=NULL;
@@ skipping 107 matching lines @@
 err:
         if (out != NULL) BIO_free_all(out);
         if (ai != NULL) ASN1_INTEGER_free(ai);
         return(ret);
         }
 
 int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix)
         {
         char buf[5][BSIZE];
         int i,j;
-        struct stat sb;
 
         i = strlen(serialfile) + strlen(old_suffix);
         j = strlen(serialfile) + strlen(new_suffix);
         if (i > j) j = i;
         if (j + 1 >= BSIZE)
                 {
                 BIO_printf(bio_err,"file name too long\n");
                 goto err;
                 }
 
 #ifndef OPENSSL_SYS_VMS
         j = BIO_snprintf(buf[0], sizeof buf[0], "%s.%s",
                 serialfile, new_suffix);
 #else
         j = BIO_snprintf(buf[0], sizeof buf[0], "%s-%s",
                 serialfile, new_suffix);
 #endif
 #ifndef OPENSSL_SYS_VMS
         j = BIO_snprintf(buf[1], sizeof buf[1], "%s.%s",
                 serialfile, old_suffix);
 #else
         j = BIO_snprintf(buf[1], sizeof buf[1], "%s-%s",
                 serialfile, old_suffix);
 #endif
-        if (stat(serialfile,&sb) < 0)
-                {
-                if (errno != ENOENT 
+#ifdef RL_DEBUG
+        BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n",
+                serialfile, buf[1]);
+#endif
+        if (rename(serialfile,buf[1]) < 0 && errno != ENOENT
 #ifdef ENOTDIR
                         && errno != ENOTDIR
 #endif
-                   )
-                        goto err;
-                }
-        else
-                {
-#ifdef RL_DEBUG
-                BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n",
-                        serialfile, buf[1]);
-#endif
-                if (rename(serialfile,buf[1]) < 0)
-                        {
+           )            {
                         BIO_printf(bio_err,
                                 "unable to rename %s to %s\n",
                                 serialfile, buf[1]);
                         perror("reason");
                         goto err;
                         }
-                }
 #ifdef RL_DEBUG
         BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n",
                 buf[0],serialfile);
 #endif
         if (rename(buf[0],serialfile) < 0)
                 {
                 BIO_printf(bio_err,
                         "unable to rename %s to %s\n",
                         buf[0],serialfile);
                 perror("reason");
@@ skipping 46 matching lines @@
                 ERR_print_errors(bio_err);
                 goto err;
                 }
         if (BIO_read_filename(in,dbfile) <= 0)
                 {
                 perror(dbfile);
                 BIO_printf(bio_err,"unable to open '%s'\n",dbfile);
                 goto err;
                 }
         if ((tmpdb = TXT_DB_read(in,DB_NUMBER)) == NULL)
-                {
-                if (tmpdb != NULL) TXT_DB_free(tmpdb);
                 goto err;
-                }
 
 #ifndef OPENSSL_SYS_VMS
         BIO_snprintf(buf[0], sizeof buf[0], "%s.attr", dbfile);
 #else
         BIO_snprintf(buf[0], sizeof buf[0], "%s-attr", dbfile);
 #endif
         dbattr_conf = NCONF_new(NULL);
         if (NCONF_load(dbattr_conf,buf[0],&errorline) <= 0)
                 {
                 if (errorline > 0)
@@ skipping 40 matching lines @@
  err:
         if (dbattr_conf) NCONF_free(dbattr_conf);
         if (tmpdb) TXT_DB_free(tmpdb);
         if (in) BIO_free_all(in);
         return retdb;
         }
 
 int index_index(CA_DB *db)
         {
         if (!TXT_DB_create_index(db->db, DB_serial, NULL,
-                                LHASH_HASH_FN(index_serial_hash),
-                                LHASH_COMP_FN(index_serial_cmp)))
+                                LHASH_HASH_FN(index_serial),
+                                LHASH_COMP_FN(index_serial)))
                 {
                 BIO_printf(bio_err,
                   "error creating serial number index:(%ld,%ld,%ld)\n",
                                         db->db->error,db->db->arg1,db->db->arg2);
                         return 0;
                 }
 
         if (db->attributes.unique_subject
                 && !TXT_DB_create_index(db->db, DB_name, index_name_qual,
-                        LHASH_HASH_FN(index_name_hash),
-                        LHASH_COMP_FN(index_name_cmp)))
+                        LHASH_HASH_FN(index_name),
+                        LHASH_COMP_FN(index_name)))
                 {
                 BIO_printf(bio_err,"error creating name index:(%ld,%ld,%ld)\n",
                         db->db->error,db->db->arg1,db->db->arg2);
                 return 0;
                 }
         return 1;
         }
 
 int save_index(const char *dbfile, const char *suffix, CA_DB *db)
         {
@@ skipping 59 matching lines @@
 
         return 1;
  err:
         return 0;
         }
 
 int rotate_index(const char *dbfile, const char *new_suffix, const char *old_suffix)
         {
         char buf[5][BSIZE];
         int i,j;
-        struct stat sb;
 
         i = strlen(dbfile) + strlen(old_suffix);
         j = strlen(dbfile) + strlen(new_suffix);
         if (i > j) j = i;
         if (j + 6 >= BSIZE)
                 {
                 BIO_printf(bio_err,"file name too long\n");
                 goto err;
                 }
 
@@ skipping 23 matching lines @@
         j = BIO_snprintf(buf[1], sizeof buf[1], "%s-%s",
                 dbfile, old_suffix);
 #endif
 #ifndef OPENSSL_SYS_VMS
         j = BIO_snprintf(buf[3], sizeof buf[3], "%s.attr.%s",
                 dbfile, old_suffix);
 #else
         j = BIO_snprintf(buf[3], sizeof buf[3], "%s-attr-%s",
                 dbfile, old_suffix);
 #endif
-        if (stat(dbfile,&sb) < 0)
-                {
-                if (errno != ENOENT 
+#ifdef RL_DEBUG
+        BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n",
+                dbfile, buf[1]);
+#endif
+        if (rename(dbfile,buf[1]) < 0 && errno != ENOENT
 #ifdef ENOTDIR
-                        && errno != ENOTDIR
+                && errno != ENOTDIR
 #endif
-                   )
-                        goto err;
-                }
-        else
-                {
-#ifdef RL_DEBUG
-                BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n",
-                        dbfile, buf[1]);
-#endif
-                if (rename(dbfile,buf[1]) < 0)
-                        {
+           )            {
                         BIO_printf(bio_err,
                                 "unable to rename %s to %s\n",
                                 dbfile, buf[1]);
                         perror("reason");
                         goto err;
                         }
-                }
 #ifdef RL_DEBUG
         BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n",
                 buf[0],dbfile);
 #endif
         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 (stat(buf[4],&sb) < 0)
-                {
-                if (errno != ENOENT 
+#ifdef RL_DEBUG
+        BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n",
+                buf[4],buf[3]);
+#endif
+        if (rename(buf[4],buf[3]) < 0 && errno != ENOENT
 #ifdef ENOTDIR
-                        && errno != ENOTDIR
+                && errno != ENOTDIR
 #endif
-                   )
-                        goto err;
-                }
-        else
-                {
-#ifdef RL_DEBUG
-                BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n",
-                        buf[4],buf[3]);
-#endif
-                if (rename(buf[4],buf[3]) < 0)
-                        {
+           )            {
                         BIO_printf(bio_err,
                                 "unable to rename %s to %s\n",
                                 buf[4], buf[3]);
                         perror("reason");
                         rename(dbfile,buf[0]);
                         rename(buf[1],dbfile);
                         goto err;
                         }
-                }
 #ifdef RL_DEBUG
         BIO_printf(bio_err, "DEBUG: renaming \"%s\" to \"%s\"\n",
                 buf[2],buf[4]);
 #endif
         if (rename(buf[2],buf[4]) < 0)
                 {
                 BIO_printf(bio_err,
                         "unable to rename %s to %s\n",
                         buf[2],buf[4]);
                 perror("reason");
@@ skipping 174 matching lines @@
         X509_NAME_free(n);
         if (ne_values)
                 OPENSSL_free(ne_values);
         if (ne_types)
                 OPENSSL_free(ne_types);
         if (buf)
                 OPENSSL_free(buf);
         return NULL;
 }
 
-/* This code MUST COME AFTER anything that uses rename() */
-#ifdef OPENSSL_SYS_WIN32
-int WIN32_rename(const char *from, const char *to)
-        {
-#ifndef OPENSSL_SYS_WINCE
-        /* Windows rename gives an error if 'to' exists, so delete it
-         * first and ignore file not found errror
-         */
-        if((remove(to) != 0) && (errno != ENOENT))
-                return -1;
-#undef rename
-        return rename(from, to);
-#else
-        /* convert strings to UNICODE */
-        {
-        BOOL result = FALSE;
-        WCHAR* wfrom;
-        WCHAR* wto;
-        int i;
-        wfrom = malloc((strlen(from)+1)*2);
-        wto = malloc((strlen(to)+1)*2);
-        if (wfrom != NULL && wto != NULL)
-                {
-                for (i=0; i<(int)strlen(from)+1; i++)
-                        wfrom[i] = (short)from[i];
-                for (i=0; i<(int)strlen(to)+1; i++)
-                        wto[i] = (short)to[i];
-                result = MoveFile(wfrom, wto);
-                }
-        if (wfrom != NULL)
-                free(wfrom);
-        if (wto != NULL)
-                free(wto);
-        return result;
-        }
-#endif
-        }
-#endif
-
 int args_verify(char ***pargs, int *pargc,
                         int *badarg, BIO *err, X509_VERIFY_PARAM **pm)
         {
         ASN1_OBJECT *otmp = NULL;
         unsigned long flags = 0;
         int i;
-        int purpose = 0;
+        int purpose = 0, depth = -1;
         char **oldargs = *pargs;
         char *arg = **pargs, *argn = (*pargs)[1];
         if (!strcmp(arg, "-policy"))
                 {
                 if (!argn)
                         *badarg = 1;
                 else
                         {
                         otmp = OBJ_txt2obj(argn, 0);
                         if (!otmp)
@@ skipping 19 matching lines @@
                                 *badarg = 1;
                                 }
                         else
                                 {
                                 xptmp = X509_PURPOSE_get0(i);
                                 purpose = X509_PURPOSE_get_id(xptmp);
                                 }
                         }
                 (*pargs)++;
                 }
+        else if (strcmp(arg,"-verify_depth") == 0)
+                {
+                if (!argn)
+                        *badarg = 1;
+                else
+                        {
+                        depth = atoi(argn);
+                        if(depth < 0)
+                                {
+                                BIO_printf(err, "invalid depth\n");
+                                *badarg = 1;
+                                }
+                        }
+                (*pargs)++;
+                }
         else if (!strcmp(arg, "-ignore_critical"))
                 flags |= X509_V_FLAG_IGNORE_CRITICAL;
         else if (!strcmp(arg, "-issuer_checks"))
                 flags |= X509_V_FLAG_CB_ISSUER_CHECK;
         else if (!strcmp(arg, "-crl_check"))
                 flags |=  X509_V_FLAG_CRL_CHECK;
         else if (!strcmp(arg, "-crl_check_all"))
                 flags |= X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL;
         else if (!strcmp(arg, "-policy_check"))
                 flags |= X509_V_FLAG_POLICY_CHECK;
         else if (!strcmp(arg, "-explicit_policy"))
                 flags |= X509_V_FLAG_EXPLICIT_POLICY;
+        else if (!strcmp(arg, "-inhibit_any"))
+                flags |= X509_V_FLAG_INHIBIT_ANY;
+        else if (!strcmp(arg, "-inhibit_map"))
+                flags |= X509_V_FLAG_INHIBIT_MAP;
         else if (!strcmp(arg, "-x509_strict"))
                 flags |= X509_V_FLAG_X509_STRICT;
+        else if (!strcmp(arg, "-extended_crl"))
+                flags |= X509_V_FLAG_EXTENDED_CRL_SUPPORT;
+        else if (!strcmp(arg, "-use_deltas"))
+                flags |= X509_V_FLAG_USE_DELTAS;
         else if (!strcmp(arg, "-policy_print"))
                 flags |= X509_V_FLAG_NOTIFY_POLICY;
         else if (!strcmp(arg, "-check_ss_sig"))
                 flags |= X509_V_FLAG_CHECK_SS_SIGNATURE;
         else
                 return 0;
 
         if (*badarg)
                 {
                 if (*pm)
                         X509_VERIFY_PARAM_free(*pm);
                 *pm = NULL;
                 goto end;
                 }
 
         if (!*pm && !(*pm = X509_VERIFY_PARAM_new()))
                 {
                 *badarg = 1;
                 goto end;
                 }
 
         if (otmp)
                 X509_VERIFY_PARAM_add0_policy(*pm, otmp);
         if (flags)
                 X509_VERIFY_PARAM_set_flags(*pm, flags);
 
         if (purpose)
                 X509_VERIFY_PARAM_set_purpose(*pm, purpose);
 
+        if (depth >= 0)
+                X509_VERIFY_PARAM_set_depth(*pm, depth);
+
         end:
 
         (*pargs)++;
 
         if (pargc)
                 *pargc -= *pargs - oldargs;
 
         return 1;
 
         }
 
+/* Read whole contents of a BIO into an allocated memory buffer and
+ * return it.
+ */
+
+int bio_to_mem(unsigned char **out, int maxlen, BIO *in)
+        {
+        BIO *mem;
+        int len, ret;
+        unsigned char tbuf[1024];
+        mem = BIO_new(BIO_s_mem());
+        if (!mem)
+                return -1;
+        for(;;)
+                {
+                if ((maxlen != -1) && maxlen < 1024)
+                        len = maxlen;
+                else
+                        len = 1024;
+                len = BIO_read(in, tbuf, len);
+                if (len <= 0)
+                        break;
+                if (BIO_write(mem, tbuf, len) != len)
+                        {
+                        BIO_free(mem);
+                        return -1;
+                        }
+                maxlen -= len;
+
+                if (maxlen == 0)
+                        break;
+                }
+        ret = BIO_get_mem_data(mem, (char **)out);
+        BIO_set_flags(mem, BIO_FLAGS_MEM_RDONLY);
+        BIO_free(mem);
+        return ret;
+        }
+
+int pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value)
+        {
+        int rv;
+        char *stmp, *vtmp = NULL;
+        stmp = BUF_strdup(value);
+        if (!stmp)
+                return -1;
+        vtmp = strchr(stmp, ':');
+        if (vtmp)
+                {
+                *vtmp = 0;
+                vtmp++;
+                }
+        rv = EVP_PKEY_CTX_ctrl_str(ctx, stmp, vtmp);
+        OPENSSL_free(stmp);
+        return rv;
+        }
+
 static void nodes_print(BIO *out, const char *name,
         STACK_OF(X509_POLICY_NODE) *nodes)
         {
         X509_POLICY_NODE *node;
         int i;
         BIO_printf(out, "%s Policies:", name);
         if (nodes)
                 {
                 BIO_puts(out, "\n");
                 for (i = 0; i < sk_X509_POLICY_NODE_num(nodes); i++)
@@ skipping 21 matching lines @@
 
         BIO_printf(out, "Require explicit Policy: %s\n",
                                 explicit_policy ? "True" : "False");
 
         nodes_print(out, "Authority", X509_policy_tree_get0_policies(tree));
         nodes_print(out, "User", X509_policy_tree_get0_user_policies(tree));
         if (free_out)
                 BIO_free(out);
         }
 
-#ifndef OPENSSL_NO_JPAKE
+#if !defined(OPENSSL_NO_JPAKE) && !defined(OPENSSL_NO_PSK)
 
 static JPAKE_CTX *jpake_init(const char *us, const char *them,
                                                          const char *secret)
         {
         BIGNUM *p = NULL;
         BIGNUM *g = NULL;
         BIGNUM *q = NULL;
         BIGNUM *bnsecret = BN_new();
         JPAKE_CTX *ctx;
 
@@ skipping 162 matching lines @@
         bconn = BIO_new(BIO_f_buffer());
         BIO_push(bconn, conn);
 
         jpake_send_step1(bconn, ctx);
         jpake_receive_step1(ctx, bconn);
         jpake_send_step2(bconn, ctx);
         jpake_receive_step2(ctx, bconn);
         jpake_send_step3a(bconn, ctx);
         jpake_receive_step3b(ctx, bconn);
 
-        /*
-         * The problem is that you must use the derived key in the
-         * session key or you are subject to man-in-the-middle
-         * attacks.
-         */
-        BIO_puts(out, "JPAKE authentication succeeded (N.B. This version can"
-                 " be MitMed. See the version in HEAD for how to do it"
-                 " properly)\n");
+        BIO_puts(out, "JPAKE authentication succeeded, setting PSK\n");
+
+        psk_key = BN_bn2hex(JPAKE_get_shared_key(ctx));
 
         BIO_pop(bconn);
         BIO_free(bconn);
+
+        JPAKE_CTX_free(ctx);
         }
 
 void jpake_server_auth(BIO *out, BIO *conn, const char *secret)
         {
         JPAKE_CTX *ctx;
         BIO *bconn;
 
         BIO_puts(out, "Authenticating with JPAKE\n");
 
         ctx = jpake_init("server", "client", secret);
 
         bconn = BIO_new(BIO_f_buffer());
         BIO_push(bconn, conn);
 
         jpake_receive_step1(ctx, bconn);
         jpake_send_step1(bconn, ctx);
         jpake_receive_step2(ctx, bconn);
         jpake_send_step2(bconn, ctx);
         jpake_receive_step3a(ctx, bconn);
         jpake_send_step3b(bconn, ctx);
 
-        /*
-         * The problem is that you must use the derived key in the
-         * session key or you are subject to man-in-the-middle
-         * attacks.
-         */
-        BIO_puts(out, "JPAKE authentication succeeded (N.B. This version can"
-                 " be MitMed. See the version in HEAD for how to do it"
-                 " properly)\n");
+        BIO_puts(out, "JPAKE authentication succeeded, setting PSK\n");
+
+        psk_key = BN_bn2hex(JPAKE_get_shared_key(ctx));
 
         BIO_pop(bconn);
         BIO_free(bconn);
-        }
-
-#endif
-
+
+        JPAKE_CTX_free(ctx);
+        }
+
+#endif
+
+/*
+ * Platform-specific sections
+ */
+#if defined(_WIN32)
+# ifdef fileno
+#  undef fileno
+#  define fileno(a) (int)_fileno(a)
+# endif
+
+# include <windows.h>
+# include <tchar.h>
+
+static int WIN32_rename(const char *from, const char *to)
+        {
+        TCHAR  *tfrom=NULL,*tto;
+        DWORD   err;
+        int     ret=0;
+
+        if (sizeof(TCHAR) == 1)
+                {
+                tfrom = (TCHAR *)from;
+                tto   = (TCHAR *)to;
+                }
+        else    /* UNICODE path */
+                {
+                size_t i,flen=strlen(from)+1,tlen=strlen(to)+1;
+                tfrom = (TCHAR *)malloc(sizeof(TCHAR)*(flen+tlen));
+                if (tfrom==NULL) goto err;
+                tto=tfrom+flen;
+#if !defined(_WIN32_WCE) || _WIN32_WCE>=101
+                if (!MultiByteToWideChar(CP_ACP,0,from,flen,(WCHAR *)tfrom,flen))
+#endif
+                        for (i=0;i<flen;i++)    tfrom[i]=(TCHAR)from[i];
+#if !defined(_WIN32_WCE) || _WIN32_WCE>=101
+                if (!MultiByteToWideChar(CP_ACP,0,to,  tlen,(WCHAR *)tto,  tlen))
+#endif
+                        for (i=0;i<tlen;i++)    tto[i]  =(TCHAR)to[i];
+                }
+
+        if (MoveFile(tfrom,tto))        goto ok;
+        err=GetLastError();
+        if (err==ERROR_ALREADY_EXISTS || err==ERROR_FILE_EXISTS)
+                {
+                if (DeleteFile(tto) && MoveFile(tfrom,tto))
+                        goto ok;
+                err=GetLastError();
+                }
+        if (err==ERROR_FILE_NOT_FOUND || err==ERROR_PATH_NOT_FOUND)
+                errno = ENOENT;
+        else if (err==ERROR_ACCESS_DENIED)
+                errno = EACCES;
+        else
+                errno = EINVAL; /* we could map more codes... */
+err:
+        ret=-1;
+ok:
+        if (tfrom!=NULL && tfrom!=(TCHAR *)from)        free(tfrom);
+        return ret;
+        }
+#endif
+
+/* app_tminterval section */
+#if defined(_WIN32)
+double app_tminterval(int stop,int usertime)
+        {
+        FILETIME                now;
+        double                  ret=0;
+        static ULARGE_INTEGER   tmstart;
+        static int              warning=1;
+#ifdef _WIN32_WINNT
+        static HANDLE           proc=NULL;
+
+        if (proc==NULL)
+                {
+                if (GetVersion() < 0x80000000)
+                        proc = OpenProcess(PROCESS_QUERY_INFORMATION,FALSE,
+                                                GetCurrentProcessId());
+                if (proc==NULL) proc = (HANDLE)-1;
+                }
+
+        if (usertime && proc!=(HANDLE)-1)
+                {
+                FILETIME junk;
+                GetProcessTimes(proc,&junk,&junk,&junk,&now);
+                }
+        else
+#endif
+                {
+                SYSTEMTIME systime;
+
+                if (usertime && warning)
+                        {
+                        BIO_printf(bio_err,"To get meaningful results, run "
+                                           "this program on idle system.\n");
+                        warning=0;
+                        }
+                GetSystemTime(&systime);
+                SystemTimeToFileTime(&systime,&now);
+                }
+
+        if (stop==TM_START)
+                {
+                tmstart.u.LowPart  = now.dwLowDateTime;
+                tmstart.u.HighPart = now.dwHighDateTime;
+                }
+        else    {
+                ULARGE_INTEGER tmstop;
+
+                tmstop.u.LowPart   = now.dwLowDateTime;
+                tmstop.u.HighPart  = now.dwHighDateTime;
+
+                ret = (__int64)(tmstop.QuadPart - tmstart.QuadPart)*1e-7;
+                }
+
+        return (ret);
+        }
+
+#elif defined(OPENSSL_SYS_NETWARE)
+#include <time.h>
+
+double app_tminterval(int stop,int usertime)
+        {
+        double          ret=0;
+        static clock_t  tmstart;
+        static int      warning=1;
+
+        if (usertime && warning)
+                {
+                BIO_printf(bio_err,"To get meaningful results, run "
+                                   "this program on idle system.\n");
+                warning=0;
+                }
+
+        if (stop==TM_START)     tmstart = clock();
+        else                    ret     = (clock()-tmstart)/(double)CLOCKS_PER_SEC;
+
+        return (ret);
+        }
+
+#elif defined(OPENSSL_SYSTEM_VXWORKS)
+#include <time.h>
+
+double app_tminterval(int stop,int usertime)
+        {
+        double ret=0;
+#ifdef CLOCK_REALTIME
+        static struct timespec  tmstart;
+        struct timespec         now;
+#else
+        static unsigned long    tmstart;
+        unsigned long           now;
+#endif
+        static int warning=1;
+
+        if (usertime && warning)
+                {
+                BIO_printf(bio_err,"To get meaningful results, run "
+                                   "this program on idle system.\n");
+                warning=0;
+                }
+
+#ifdef CLOCK_REALTIME
+        clock_gettime(CLOCK_REALTIME,&now);
+        if (stop==TM_START)     tmstart = now;
+        else    ret = ( (now.tv_sec+now.tv_nsec*1e-9)
+                        - (tmstart.tv_sec+tmstart.tv_nsec*1e-9) );
+#else
+        now = tickGet();
+        if (stop==TM_START)     tmstart = now;
+        else                    ret = (now - tmstart)/(double)sysClkRateGet();
+#endif
+        return (ret);
+        }
+
+#elif defined(OPENSSL_SYSTEM_VMS)
+#include <time.h>
+#include <times.h>
+
+double app_tminterval(int stop,int usertime)
+        {
+        static clock_t  tmstart;
+        double          ret = 0;
+        clock_t         now;
+#ifdef __TMS
+        struct tms      rus;
+
+        now = times(&rus);
+        if (usertime)   now = rus.tms_utime;
+#else
+        if (usertime)
+                now = clock(); /* sum of user and kernel times */
+        else    {
+                struct timeval tv;
+                gettimeofday(&tv,NULL);
+                now = (clock_t)(
+                        (unsigned long long)tv.tv_sec*CLK_TCK +
+                        (unsigned long long)tv.tv_usec*(1000000/CLK_TCK)
+                        );
+                }
+#endif
+        if (stop==TM_START)     tmstart = now;
+        else                    ret = (now - tmstart)/(double)(CLK_TCK);
+
+        return (ret);
+        }
+
+#elif defined(_SC_CLK_TCK)      /* by means of unistd.h */
+#include <sys/times.h>
+
+double app_tminterval(int stop,int usertime)
+        {
+        double          ret = 0;
+        struct tms      rus;
+        clock_t         now = times(&rus);
+        static clock_t  tmstart;
+
+        if (usertime)           now = rus.tms_utime;
+
+        if (stop==TM_START)     tmstart = now;
+        else
+                {
+                long int tck = sysconf(_SC_CLK_TCK);
+                ret = (now - tmstart)/(double)tck;
+                }
+
+        return (ret);
+        }
+
+#else
+#include <sys/time.h>
+#include <sys/resource.h>
+
+double app_tminterval(int stop,int usertime)
+        {
+        double          ret = 0;
+        struct rusage   rus;
+        struct timeval  now;
+        static struct timeval tmstart;
+
+        if (usertime)           getrusage(RUSAGE_SELF,&rus), now = rus.ru_utime;
+        else                    gettimeofday(&now,NULL);
+
+        if (stop==TM_START)     tmstart = now;
+        else                    ret = ( (now.tv_sec+now.tv_usec*1e-6)
+                                        - (tmstart.tv_sec+tmstart.tv_usec*1e-6) );
+
+        return ret;
+        }
+#endif
+
+/* app_isdir section */
+#ifdef _WIN32
+int app_isdir(const char *name)
+        {
+        HANDLE          hList;
+        WIN32_FIND_DATA FileData;
+#if defined(UNICODE) || defined(_UNICODE)
+        size_t i, len_0 = strlen(name)+1;
+
+        if (len_0 > sizeof(FileData.cFileName)/sizeof(FileData.cFileName[0]))
+                return -1;
+
+#if !defined(_WIN32_WCE) || _WIN32_WCE>=101
+        if (!MultiByteToWideChar(CP_ACP,0,name,len_0,FileData.cFileName,len_0))
+#endif
+                for (i=0;i<len_0;i++)
+                        FileData.cFileName[i] = (WCHAR)name[i];
+
+        hList = FindFirstFile(FileData.cFileName,&FileData);
+#else
+        hList = FindFirstFile(name,&FileData);
+#endif
+        if (hList == INVALID_HANDLE_VALUE)      return -1;
+        FindClose(hList);
+        return ((FileData.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)!=0);
+        }
+#else
+#include <sys/stat.h>
+#ifndef S_ISDIR
+# if defined(_S_IFMT) && defined(_S_IFDIR)
+#  define S_ISDIR(a)   (((a) & _S_IFMT) == _S_IFDIR)
+# else 
+#  define S_ISDIR(a)   (((a) & S_IFMT) == S_IFDIR)
+# endif 
+#endif 
+
+int app_isdir(const char *name)
+        {
+#if defined(S_ISDIR)
+        struct stat st;
+
+        if (stat(name,&st)==0)  return S_ISDIR(st.st_mode);
+        else                    return -1;
+#else
+        return -1;
+#endif
+        }
+#endif
+
+/* raw_read|write section */
+#if defined(_WIN32) && defined(STD_INPUT_HANDLE)
+int raw_read_stdin(void *buf,int siz)
+        {
+        DWORD n;
+        if (ReadFile(GetStdHandle(STD_INPUT_HANDLE),buf,siz,&n,NULL))
+                return (n);
+        else    return (-1);
+        }
+#else
+int raw_read_stdin(void *buf,int siz)
+        {       return read(fileno(stdin),buf,siz);     }
+#endif
+
+#if defined(_WIN32) && defined(STD_OUTPUT_HANDLE)
+int raw_write_stdout(const void *buf,int siz)
+        {
+        DWORD n;
+        if (WriteFile(GetStdHandle(STD_OUTPUT_HANDLE),buf,siz,&n,NULL))
+                return (n);
+        else    return (-1);
+        }
+#else
+int raw_write_stdout(const void *buf,int siz)
+        {       return write(fileno(stdout),buf,siz);   }
+#endif
+
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG)
 /* next_protos_parse parses a comma separated list of strings into a string
  * in a format suitable for passing to SSL_CTX_set_next_protos_advertised.
  *   outlen: (output) set to the length of the resulting buffer on success.
- *   err: (maybe NULL) on failure, an error message line is written to this BIO.
  *   in: a NUL termianted string like "abc,def,ghi"
  *
- *   returns: a malloced buffer
+ *   returns: a malloced buffer or NULL on failure.
  */
 unsigned char *next_protos_parse(unsigned short *outlen, const char *in)
         {
         size_t len;
         unsigned char *out;
         size_t i, start = 0;
 
         len = strlen(in);
-        if (len > 65535)
+        if (len >= 65535)
                 return NULL;
 
         out = OPENSSL_malloc(strlen(in) + 1);
         if (!out)
                 return NULL;
 
         for (i = 0; i <= len; ++i)
                 {
                 if (i == len || in[i] == ',')
                         {
                         if (i - start > 255)
                                 {
                                 OPENSSL_free(out);
                                 return NULL;
                                 }
                         out[start] = i - start;
                         start = i + 1;
                         }
                 else
                         out[i+1] = in[i];
                 }
 
         *outlen = len + 1;
         return out;
         }
+#endif  /* !OPENSSL_NO_TLSEXT && !OPENSSL_NO_NEXTPROTONEG */