Fix windows build

[openssl.git] / apps / apps.c

diff --git a/apps/apps.c b/apps/apps.c
index 5eadc72cfdc2640a88b0d583a4068956654aedb8..53b76e9f5d124253b72010b9e0ca666acd52ffdd 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -180,7 +180,7 @@ int chopup_args(ARGS *arg, char *buf)
     arg->argc = 0;
     if (arg->size == 0) {
         arg->size = 20;
     arg->argc = 0;
     if (arg->size == 0) {
         arg->size = 20;

-        arg->argv = OPENSSL_malloc(sizeof(char *) * arg->size);
+        arg->argv = app_malloc(sizeof(*arg->argv) * arg->size, "argv space");

         if (arg->argv == NULL)
             return 0;
     }
         if (arg->argv == NULL)
             return 0;
     }


@@ -195,7 +195,8 @@ int chopup_args(ARGS *arg, char *buf)
         /* The start of something good :-) */
         if (arg->argc >= arg->size) {
             arg->size += 20;
         /* The start of something good :-) */
         if (arg->argc >= arg->size) {
             arg->size += 20;

-            arg->argv = OPENSSL_realloc(arg->argv, sizeof(char *) * arg->size);
+            arg->argv = OPENSSL_realloc(arg->argv,
+                                        sizeof(*arg->argv) * arg->size);

             if (arg->argv == NULL)
                 return 0;
         }
             if (arg->argv == NULL)
                 return 0;
         }


@@ -367,13 +368,7 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp)
             ok = UI_add_input_string(ui, prompt, ui_flags, buf,
                                      PW_MIN_LENGTH, bufsiz - 1);
         if (ok >= 0 && verify) {
             ok = UI_add_input_string(ui, prompt, ui_flags, buf,
                                      PW_MIN_LENGTH, bufsiz - 1);
         if (ok >= 0 && verify) {

-            buff = OPENSSL_malloc(bufsiz);
-            if (!buff) {
-                BIO_printf(bio_err, "Out of memory\n");
-                UI_free(ui);
-                OPENSSL_free(prompt);
-                return 0;
-            }
+            buff = app_malloc(bufsiz, "password buffer");

             ok = UI_add_verify_string(ui, prompt, ui_flags, buff,
                                       PW_MIN_LENGTH, bufsiz - 1, buf);
         }
             ok = UI_add_verify_string(ui, prompt, ui_flags, buff,
                                       PW_MIN_LENGTH, bufsiz - 1, buf);
         }


@@ -383,10 +378,7 @@ int password_callback(char *buf, int bufsiz, int verify, PW_CB_DATA *cb_tmp)
             }
             while (ok < 0 && UI_ctrl(ui, UI_CTRL_IS_REDOABLE, 0, 0, 0));
 
             }
             while (ok < 0 && UI_ctrl(ui, UI_CTRL_IS_REDOABLE, 0, 0, 0));
 

-        if (buff) {
-            OPENSSL_cleanse(buff, (unsigned int)bufsiz);
-            OPENSSL_free(buff);
-        }
+        OPENSSL_clear_free(buff, (unsigned int)bufsiz);

 
         if (ok >= 0)
             res = strlen(buf);
 
         if (ok >= 0)
             res = strlen(buf);


@@ -601,16 +593,12 @@ int load_cert_crl_http(const char *url, X509 **pcert, X509_CRL **pcrl)
     }
 
  err:
     }
 
  err:

-    if (host)
-        OPENSSL_free(host);
-    if (path)
-        OPENSSL_free(path);
-    if (port)
-        OPENSSL_free(port);
+    OPENSSL_free(host);
+    OPENSSL_free(path);
+    OPENSSL_free(port);

     if (bio)
         BIO_free_all(bio);
     if (bio)
         BIO_free_all(bio);

-    if (rctx)
-        OCSP_REQ_CTX_free(rctx);
+    OCSP_REQ_CTX_free(rctx);

     if (rv != 1) {
         BIO_printf(bio_err, "Error loading %s from %s\n",
                    pcert ? "certificate" : "CRL", url);
     if (rv != 1) {
         BIO_printf(bio_err, "Error loading %s from %s\n",
                    pcert ? "certificate" : "CRL", url);


@@ -670,8 +658,7 @@ X509 *load_cert(const char *file, int format,
         BIO_printf(bio_err, "unable to load certificate\n");
         ERR_print_errors(bio_err);
     }
         BIO_printf(bio_err, "unable to load certificate\n");
         ERR_print_errors(bio_err);
     }

-    if (cert != NULL)
-        BIO_free(cert);
+    BIO_free(cert);

     return (x);
 }
 
     return (x);
 }
 


@@ -771,8 +758,7 @@ EVP_PKEY *load_key(const char *file, int format, int maybe_stdin,
         goto end;
     }
  end:
         goto end;
     }
  end:

-    if (key != NULL)
-        BIO_free(key);
+    BIO_free(key);

     if (pkey == NULL) {
         BIO_printf(bio_err, "unable to load %s\n", key_descrip);
         ERR_print_errors(bio_err);
     if (pkey == NULL) {
         BIO_printf(bio_err, "unable to load %s\n", key_descrip);
         ERR_print_errors(bio_err);


@@ -859,8 +845,7 @@ EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin,
         pkey = b2i_PublicKey_bio(key);
 #endif
  end:
         pkey = b2i_PublicKey_bio(key);
 #endif
  end:

-    if (key != NULL)
-        BIO_free(key);
+    BIO_free(key);

     if (pkey == NULL)
         BIO_printf(bio_err, "unable to load %s\n", key_descrip);
     return (pkey);
     if (pkey == NULL)
         BIO_printf(bio_err, "unable to load %s\n", key_descrip);
     return (pkey);


@@ -971,8 +956,7 @@ static int load_certs_crls(const char *file, int format,
 
  end:
 
 
  end:
 

-    if (xis)
-        sk_X509_INFO_pop_free(xis, X509_INFO_free);
+    sk_X509_INFO_pop_free(xis, X509_INFO_free);

 
     if (rv == 0) {
         if (pcerts) {
 
     if (rv == 0) {
         if (pcerts) {


@@ -990,6 +974,21 @@ static int load_certs_crls(const char *file, int format,
     return rv;
 }
 
     return rv;
 }
 

+void* app_malloc(int sz, const char *what)
+{
+    void *vp = OPENSSL_malloc(sz);
+
+    if (vp == NULL) {
+        BIO_printf(bio_err, "%s: Could not allocate %d bytes for %s\n",
+                opt_getprog(), sz, what);
+        ERR_print_errors(bio_err);
+        exit(1);
+    }
+    return vp;
+}
+
+
+

 STACK_OF(X509) *load_certs(const char *file, int format,
                            const char *pass, ENGINE *e, const char *desc)
 {
 STACK_OF(X509) *load_certs(const char *file, int format,
                            const char *pass, ENGINE *e, const char *desc)
 {


@@ -1528,6 +1527,7 @@ int rand_serial(BIGNUM *b, ASN1_INTEGER *ai)
 {
     BIGNUM *btmp;
     int ret = 0;
 {
     BIGNUM *btmp;
     int ret = 0;

+

     if (b)
         btmp = b;
     else
     if (b)
         btmp = b;
     else


@@ -1545,7 +1545,7 @@ int rand_serial(BIGNUM *b, ASN1_INTEGER *ai)
 
  error:
 
 
  error:
 

-    if (!b)
+    if (btmp != b)

         BN_free(btmp);
 
     return ret;
         BN_free(btmp);
 
     return ret;


@@ -1586,11 +1586,7 @@ CA_DB *load_index(char *dbfile, DB_ATTR *db_attr)
         }
     }
 
         }
     }
 

-    if ((retdb = OPENSSL_malloc(sizeof(CA_DB))) == NULL) {
-        fprintf(stderr, "Out of memory\n");
-        goto err;
-    }
-
+    retdb = app_malloc(sizeof(*retdb), "new DB");

     retdb->db = tmpdb;
     tmpdb = NULL;
     if (db_attr)
     retdb->db = tmpdb;
     tmpdb = NULL;
     if (db_attr)


@@ -1611,10 +1607,8 @@ CA_DB *load_index(char *dbfile, DB_ATTR *db_attr)
     }
 
  err:
     }
 
  err:

-    if (dbattr_conf)
-        NCONF_free(dbattr_conf);
-    if (tmpdb)
-        TXT_DB_free(tmpdb);
+    NCONF_free(dbattr_conf);
+    TXT_DB_free(tmpdb);

     BIO_free_all(in);
     return retdb;
 }
     BIO_free_all(in);
     return retdb;
 }


@@ -1792,8 +1786,7 @@ int rotate_index(const char *dbfile, const char *new_suffix,
 void free_index(CA_DB *db)
 {
     if (db) {
 void free_index(CA_DB *db)
 {
     if (db) {

-        if (db->db)
-            TXT_DB_free(db->db);
+        TXT_DB_free(db->db);

         OPENSSL_free(db);
     }
 }
         OPENSSL_free(db);
     }
 }


@@ -2166,9 +2159,7 @@ void jpake_client_auth(BIO *out, BIO *conn, const char *secret)
 
     BIO_puts(out, "JPAKE authentication succeeded, setting PSK\n");
 
 
     BIO_puts(out, "JPAKE authentication succeeded, setting PSK\n");
 

-    if (psk_key)
-        OPENSSL_free(psk_key);
-
+    OPENSSL_free(psk_key);

     psk_key = BN_bn2hex(JPAKE_get_shared_key(ctx));
 
     BIO_pop(bconn);
     psk_key = BN_bn2hex(JPAKE_get_shared_key(ctx));
 
     BIO_pop(bconn);


@@ -2198,9 +2189,7 @@ void jpake_server_auth(BIO *out, BIO *conn, const char *secret)
 
     BIO_puts(out, "JPAKE authentication succeeded, setting PSK\n");
 
 
     BIO_puts(out, "JPAKE authentication succeeded, setting PSK\n");
 

-    if (psk_key)
-        OPENSSL_free(psk_key);
-
+    OPENSSL_free(psk_key);

     psk_key = BN_bn2hex(JPAKE_get_shared_key(ctx));
 
     BIO_pop(bconn);
     psk_key = BN_bn2hex(JPAKE_get_shared_key(ctx));
 
     BIO_pop(bconn);


@@ -2231,10 +2220,7 @@ unsigned char *next_protos_parse(unsigned short *outlen, const char *in)
     if (len >= 65535)
         return NULL;
 
     if (len >= 65535)
         return NULL;
 

-    out = OPENSSL_malloc(strlen(in) + 1);
-    if (!out)
-        return NULL;
-
+    out = app_malloc(strlen(in) + 1, "NPN buffer");

     for (i = 0; i <= len; ++i) {
         if (i == len || in[i] == ',') {
             if (i - start > 255) {
     for (i = 0; i <= len; ++i) {
         if (i == len || in[i] == ',') {
             if (i - start > 255) {


@@ -2379,7 +2365,7 @@ static int WIN32_rename(const char *from, const char *to)
     } else {                    /* UNICODE path */
 
         size_t i, flen = strlen(from) + 1, tlen = strlen(to) + 1;
     } else {                    /* UNICODE path */
 
         size_t i, flen = strlen(from) + 1, tlen = strlen(to) + 1;

-        tfrom = (TCHAR *)malloc(sizeof(TCHAR) * (flen + tlen));
+        tfrom = malloc(sizeof(*tfrom) * (flen + tlen));

         if (tfrom == NULL)
             goto err;
         tto = tfrom + flen;
         if (tfrom == NULL)
             goto err;
         tto = tfrom + flen;


@@ -2669,7 +2655,7 @@ int app_isdir(const char *name)
 # if defined(UNICODE) || defined(_UNICODE)
     size_t i, len_0 = strlen(name) + 1;
 
 # if defined(UNICODE) || defined(_UNICODE)
     size_t i, len_0 = strlen(name) + 1;
 

-    if (len_0 > sizeof(FileData.cFileName) / sizeof(FileData.cFileName[0]))
+    if (len_0 > OSSL_NELEM(FileData.cFileName))

         return -1;
 
 #  if !defined(_WIN32_WCE) || _WIN32_WCE>=101
         return -1;
 
 #  if !defined(_WIN32_WCE) || _WIN32_WCE>=101