diff options
Diffstat (limited to 'lib/libssl/src/apps')
37 files changed, 196 insertions, 196 deletions
diff --git a/lib/libssl/src/apps/apps.c b/lib/libssl/src/apps/apps.c index e92e95b332c..753dbf52b57 100644 --- a/lib/libssl/src/apps/apps.c +++ b/lib/libssl/src/apps/apps.c @@ -211,7 +211,7 @@ chopup_args(ARGS *arg, char *buf, int *argc, char **argv[]) i = 0; if (arg->count == 0) { arg->count = 20; - arg->data = (char **)OPENSSL_malloc(sizeof(char *)*arg->count); + arg->data = (char **)malloc(sizeof(char *)*arg->count); } for (i = 0; i < arg->count; i++) arg->data[i] = NULL; @@ -231,7 +231,7 @@ chopup_args(ARGS *arg, char *buf, int *argc, char **argv[]) if (num >= arg->count) { char **tmp_p; int tlen = arg->count + 20; - tmp_p = (char **)OPENSSL_realloc(arg->data, + tmp_p = (char **)realloc(arg->data, sizeof(char *)*tlen); if (tmp_p == NULL) return 0; @@ -284,13 +284,13 @@ int dump_cert_text (BIO *out, X509 *x) p = X509_NAME_oneline(X509_get_subject_name(x), NULL, 0); BIO_puts(out, "subject="); BIO_puts(out, p); - OPENSSL_free(p); + free(p); p = X509_NAME_oneline(X509_get_issuer_name(x), NULL, 0); BIO_puts(out, "\nissuer="); BIO_puts(out, p); BIO_puts(out, "\n"); - OPENSSL_free(p); + free(p); return 0; } @@ -413,7 +413,7 @@ password_callback(char *buf, int bufsiz, int verify, ok = UI_add_input_string(ui, prompt, ui_flags, buf, PW_MIN_LENGTH, bufsiz - 1); if (ok >= 0 && verify) { - buff = (char *)OPENSSL_malloc(bufsiz); + buff = (char *)malloc(bufsiz); ok = UI_add_verify_string(ui, prompt, ui_flags, buff, PW_MIN_LENGTH, bufsiz - 1, buf); } @@ -425,7 +425,7 @@ password_callback(char *buf, int bufsiz, int verify, if (buff) { OPENSSL_cleanse(buff, (unsigned int)bufsiz); - OPENSSL_free(buff); + free(buff); } if (ok >= 0) @@ -442,7 +442,7 @@ password_callback(char *buf, int bufsiz, int verify, res = 0; } UI_free(ui); - OPENSSL_free(prompt); + free(prompt); } return res; } @@ -1200,7 +1200,7 @@ print_name(BIO *out, const char *title, X509_NAME *nm, unsigned long lflags) buf = X509_NAME_oneline(nm, 0, 0); BIO_puts(out, buf); BIO_puts(out, "\n"); - OPENSSL_free(buf); + free(buf); } else { if (mline) BIO_puts(out, "\n"); @@ -1330,7 +1330,7 @@ make_config_name() char *p; len = strlen(t) + strlen(OPENSSL_CONF) + 2; - p = OPENSSL_malloc(len); + p = malloc(len); BUF_strlcpy(p, t, len); BUF_strlcat(p, "/", len); BUF_strlcat(p, OPENSSL_CONF, len); @@ -1607,7 +1607,7 @@ load_index(char *dbfile, DB_ATTR *db_attr) } } - if ((retdb = OPENSSL_malloc(sizeof(CA_DB))) == NULL) { + if ((retdb = malloc(sizeof(CA_DB))) == NULL) { fprintf(stderr, "Out of memory\n"); goto err; } @@ -1809,7 +1809,7 @@ free_index(CA_DB *db) if (db) { if (db->db) TXT_DB_free(db->db); - OPENSSL_free(db); + free(db); } } @@ -1849,11 +1849,11 @@ X509_NAME * parse_name(char *subject, long chtype, int multirdn) { size_t buflen = strlen(subject)+1; /* to copy the types and values into. due to escaping, the copy can only become shorter */ - char *buf = OPENSSL_malloc(buflen); + char *buf = malloc(buflen); size_t max_ne = buflen / 2 + 1; /* maximum number of name elements */ - char **ne_types = OPENSSL_malloc(max_ne * sizeof (char *)); - char **ne_values = OPENSSL_malloc(max_ne * sizeof (char *)); - int *mval = OPENSSL_malloc (max_ne * sizeof (int)); + char **ne_types = malloc(max_ne * sizeof (char *)); + char **ne_values = malloc(max_ne * sizeof (char *)); + int *mval = malloc (max_ne * sizeof (int)); char *sp = subject, *bp = buf; int i, ne_num = 0; @@ -1942,22 +1942,22 @@ parse_name(char *subject, long chtype, int multirdn) goto error; } - OPENSSL_free(ne_values); - OPENSSL_free(ne_types); - OPENSSL_free(buf); - OPENSSL_free(mval); + free(ne_values); + free(ne_types); + free(buf); + free(mval); return n; error: X509_NAME_free(n); if (ne_values) - OPENSSL_free(ne_values); + free(ne_values); if (ne_types) - OPENSSL_free(ne_types); + free(ne_types); if (mval) - OPENSSL_free(mval); + free(mval); if (buf) - OPENSSL_free(buf); + free(buf); return NULL; } @@ -2141,7 +2141,7 @@ pkey_ctrl_string(EVP_PKEY_CTX *ctx, char *value) vtmp++; } rv = EVP_PKEY_CTX_ctrl_str(ctx, stmp, vtmp); - OPENSSL_free(stmp); + free(stmp); return rv; } @@ -2437,14 +2437,14 @@ next_protos_parse(unsigned short *outlen, const char *in) if (len >= 65535) return NULL; - out = OPENSSL_malloc(strlen(in) + 1); + out = 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); + free(out); return NULL; } out[start] = i - start; diff --git a/lib/libssl/src/apps/ca.c b/lib/libssl/src/apps/ca.c index cca54aebce7..9c75e1a4f4b 100644 --- a/lib/libssl/src/apps/ca.c +++ b/lib/libssl/src/apps/ca.c @@ -543,7 +543,7 @@ bad: size_t len; len = strlen(s) + sizeof(CONFIG_FILE) + 1; - tofree = OPENSSL_malloc(len); + tofree = malloc(len); BUF_strlcpy(tofree, s, len); BUF_strlcat(tofree, "/", len); BUF_strlcat(tofree, CONFIG_FILE, len); @@ -562,7 +562,7 @@ bad: goto err; } if (tofree) { - OPENSSL_free(tofree); + free(tofree); tofree = NULL; } @@ -1028,7 +1028,7 @@ bad: if ((f = BN_bn2hex(serial)) == NULL) goto err; BIO_printf(bio_err, "next serial number is %s\n", f); - OPENSSL_free(f); + free(f); } } @@ -1384,7 +1384,7 @@ bad: ret = 0; err: if (tofree) - OPENSSL_free(tofree); + free(tofree); BIO_free_all(Cout); BIO_free_all(Sout); BIO_free_all(out); @@ -1397,7 +1397,7 @@ err: ERR_print_errors(bio_err); app_RAND_write_file(randfile, bio_err); if (free_key && key) - OPENSSL_free(key); + free(key); BN_free(serial); BN_free(crlnumber); free_index(db); @@ -1973,17 +1973,17 @@ again2: goto err; /* We now just add it to the database */ - row[DB_type] = (char *)OPENSSL_malloc(2); + row[DB_type] = (char *)malloc(2); tm = X509_get_notAfter(ret); - row[DB_exp_date] = (char *)OPENSSL_malloc(tm->length + 1); + row[DB_exp_date] = (char *)malloc(tm->length + 1); memcpy(row[DB_exp_date], tm->data, tm->length); row[DB_exp_date][tm->length] = '\0'; row[DB_rev_date] = NULL; /* row[DB_serial] done already */ - row[DB_file] = (char *)OPENSSL_malloc(8); + row[DB_file] = (char *)malloc(8); row[DB_name] = X509_NAME_oneline(X509_get_subject_name(ret), NULL, 0); if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) || @@ -1995,7 +1995,7 @@ again2: row[DB_type][0] = 'V'; row[DB_type][1] = '\0'; - if ((irow = (char **)OPENSSL_malloc(sizeof(char *)*(DB_NUMBER + 1))) == NULL) { + if ((irow = (char **)malloc(sizeof(char *)*(DB_NUMBER + 1))) == NULL) { BIO_printf(bio_err, "Memory allocation failure\n"); goto err; } @@ -2015,7 +2015,7 @@ again2: err: for (i = 0; i < DB_NUMBER; i++) if (row[i] != NULL) - OPENSSL_free(row[i]); + free(row[i]); if (CAname != NULL) X509_NAME_free(CAname); @@ -2233,17 +2233,17 @@ do_revoke(X509 *x509, CA_DB *db, int type, char *value) BIO_printf(bio_err, "Adding Entry with serial number %s to DB for %s\n", row[DB_serial], row[DB_name]); /* We now just add it to the database */ - row[DB_type] = (char *)OPENSSL_malloc(2); + row[DB_type] = (char *)malloc(2); tm = X509_get_notAfter(x509); - row[DB_exp_date] = (char *)OPENSSL_malloc(tm->length + 1); + row[DB_exp_date] = (char *)malloc(tm->length + 1); memcpy(row[DB_exp_date], tm->data, tm->length); row[DB_exp_date][tm->length] = '\0'; row[DB_rev_date] = NULL; /* row[DB_serial] done already */ - row[DB_file] = (char *)OPENSSL_malloc(8); + row[DB_file] = (char *)malloc(8); /* row[DB_name] done already */ @@ -2256,7 +2256,7 @@ do_revoke(X509 *x509, CA_DB *db, int type, char *value) row[DB_type][0] = 'V'; row[DB_type][1] = '\0'; - if ((irow = (char **)OPENSSL_malloc(sizeof(char *)*(DB_NUMBER + 1))) == NULL) { + if ((irow = (char **)malloc(sizeof(char *)*(DB_NUMBER + 1))) == NULL) { BIO_printf(bio_err, "Memory allocation failure\n"); goto err; } @@ -2301,7 +2301,7 @@ do_revoke(X509 *x509, CA_DB *db, int type, char *value) err: for (i = 0; i < DB_NUMBER; i++) { if (row[i] != NULL) - OPENSSL_free(row[i]); + free(row[i]); } return (ok); } @@ -2317,7 +2317,7 @@ get_certificate_status(const char *serial, CA_DB *db) row[i] = NULL; /* Malloc needed char spaces */ - row[DB_serial] = OPENSSL_malloc(strlen(serial) + 2); + row[DB_serial] = malloc(strlen(serial) + 2); if (row[DB_serial] == NULL) { BIO_printf(bio_err, "Malloc failure\n"); goto err; @@ -2374,7 +2374,7 @@ get_certificate_status(const char *serial, CA_DB *db) err: for (i = 0; i < DB_NUMBER; i++) { if (row[i] != NULL) - OPENSSL_free(row[i]); + free(row[i]); } return (ok); } @@ -2390,7 +2390,7 @@ static int do_updatedb (CA_DB *db) /* get actual time and make a string */ a_tm = X509_gmtime_adj(a_tm, 0); - a_tm_s = (char *) OPENSSL_malloc(a_tm->length + 1); + a_tm_s = (char *) malloc(a_tm->length + 1); if (a_tm_s == NULL) { cnt = -1; goto err; @@ -2438,7 +2438,7 @@ static int do_updatedb (CA_DB *db) err: ASN1_UTCTIME_free(a_tm); - OPENSSL_free(a_tm_s); + free(a_tm_s); return (cnt); } @@ -2536,7 +2536,7 @@ make_revocation_str(int rev_type, char *rev_arg) if (other) i += strlen(other) + 1; - str = OPENSSL_malloc(i); + str = malloc(i); if (!str) return NULL; @@ -2606,7 +2606,7 @@ make_revoked(X509_REVOKED *rev, const char *str) err: if (tmp) - OPENSSL_free(tmp); + free(tmp); ASN1_OBJECT_free(hold); ASN1_GENERALIZEDTIME_free(comp_time); ASN1_ENUMERATED_free(rtmp); @@ -2747,7 +2747,7 @@ unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold, err: if (tmp) - OPENSSL_free(tmp); + free(tmp); if (!phold) ASN1_OBJECT_free(hold); if (!pinvtm) diff --git a/lib/libssl/src/apps/cms.c b/lib/libssl/src/apps/cms.c index 553b6de76e5..eda3ccbdf05 100644 --- a/lib/libssl/src/apps/cms.c +++ b/lib/libssl/src/apps/cms.c @@ -1023,11 +1023,11 @@ end: if (skkeys) sk_OPENSSL_STRING_free(skkeys); if (secret_key) - OPENSSL_free(secret_key); + free(secret_key); if (secret_keyid) - OPENSSL_free(secret_keyid); + free(secret_keyid); if (pwri_tmp) - OPENSSL_free(pwri_tmp); + free(pwri_tmp); if (econtent_type) ASN1_OBJECT_free(econtent_type); if (rr) @@ -1048,7 +1048,7 @@ end: BIO_free(indata); BIO_free_all(out); if (passin) - OPENSSL_free(passin); + free(passin); return (ret); } diff --git a/lib/libssl/src/apps/crl2p7.c b/lib/libssl/src/apps/crl2p7.c index b85ef51cfb7..bfd2d81e880 100644 --- a/lib/libssl/src/apps/crl2p7.c +++ b/lib/libssl/src/apps/crl2p7.c @@ -209,7 +209,7 @@ bad: p7s->crl = crl_stack; if (crl != NULL) { sk_X509_CRL_push(crl_stack, crl); - crl=NULL; /* now part of p7 for OPENSSL_freeing */ + crl=NULL; /* now part of p7 for freeing */ } if ((cert_stack = sk_X509_new_null()) == NULL) @@ -311,7 +311,7 @@ add_certs_from_file(STACK_OF(X509) *stack, char *certfile) ret = count; end: - /* never need to OPENSSL_free x */ + /* never need to free x */ if (in != NULL) BIO_free(in); if (sk != NULL) diff --git a/lib/libssl/src/apps/dgst.c b/lib/libssl/src/apps/dgst.c index 388c95e5ec5..7336023b30e 100644 --- a/lib/libssl/src/apps/dgst.c +++ b/lib/libssl/src/apps/dgst.c @@ -133,7 +133,7 @@ MAIN(int argc, char **argv) apps_startup(); - if ((buf = (unsigned char *)OPENSSL_malloc(BUFSIZE)) == NULL) { + if ((buf = (unsigned char *)malloc(BUFSIZE)) == NULL) { BIO_printf(bio_err, "out of memory\n"); goto end; } @@ -428,7 +428,7 @@ MAIN(int argc, char **argv) BIO *sigbio; sigbio = BIO_new_file(sigfile, "rb"); siglen = EVP_PKEY_size(sigkey); - sigbuf = OPENSSL_malloc(siglen); + sigbuf = malloc(siglen); if (!sigbio) { BIO_printf(bio_err, "Error opening signature file %s\n", sigfile); @@ -488,19 +488,19 @@ MAIN(int argc, char **argv) end: if (buf != NULL) { OPENSSL_cleanse(buf, BUFSIZE); - OPENSSL_free(buf); + free(buf); } if (in != NULL) BIO_free(in); if (passin) - OPENSSL_free(passin); + free(passin); BIO_free_all(out); EVP_PKEY_free(sigkey); if (sigopts) sk_OPENSSL_STRING_free(sigopts); if (macopts) sk_OPENSSL_STRING_free(macopts); - if (sigbuf) OPENSSL_free(sigbuf); + if (sigbuf) free(sigbuf); if (bmd != NULL) BIO_free(bmd); apps_shutdown(); diff --git a/lib/libssl/src/apps/dh.c b/lib/libssl/src/apps/dh.c index 0ad7121b372..f362c5aeddb 100644 --- a/lib/libssl/src/apps/dh.c +++ b/lib/libssl/src/apps/dh.c @@ -261,9 +261,9 @@ bad: len = BN_num_bytes(dh->p); bits = BN_num_bits(dh->p); - data = (unsigned char *)OPENSSL_malloc(len); + data = (unsigned char *)malloc(len); if (data == NULL) { - perror("OPENSSL_malloc"); + perror("malloc"); goto end; } l = BN_bn2bin(dh->p, data); @@ -294,7 +294,7 @@ bad: printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n"); printf("\t\treturn(NULL);\n"); printf("\treturn(dh);\n\t}\n"); - OPENSSL_free(data); + free(data); } if (!noout) { diff --git a/lib/libssl/src/apps/dhparam.c b/lib/libssl/src/apps/dhparam.c index 718c744722f..d8fb930cb32 100644 --- a/lib/libssl/src/apps/dhparam.c +++ b/lib/libssl/src/apps/dhparam.c @@ -426,9 +426,9 @@ bad: len = BN_num_bytes(dh->p); bits = BN_num_bits(dh->p); - data = (unsigned char *)OPENSSL_malloc(len); + data = (unsigned char *)malloc(len); if (data == NULL) { - perror("OPENSSL_malloc"); + perror("malloc"); goto end; } printf("#ifndef HEADER_DH_H\n" @@ -465,7 +465,7 @@ bad: if (dh->length) printf("\tdh->length = %ld;\n", dh->length); printf("\treturn(dh);\n\t}\n"); - OPENSSL_free(data); + free(data); } if (!noout) { diff --git a/lib/libssl/src/apps/dsa.c b/lib/libssl/src/apps/dsa.c index b2c58d03c16..af5702cf72f 100644 --- a/lib/libssl/src/apps/dsa.c +++ b/lib/libssl/src/apps/dsa.c @@ -341,8 +341,8 @@ end: if (in != NULL) BIO_free(in); if (out != NULL) BIO_free_all(out); if (dsa != NULL) DSA_free(dsa); - if (passin) OPENSSL_free(passin); - if (passout) OPENSSL_free(passout); + if (passin) free(passin); + if (passout) free(passout); apps_shutdown(); OPENSSL_EXIT(ret); } diff --git a/lib/libssl/src/apps/dsaparam.c b/lib/libssl/src/apps/dsaparam.c index 9cd81ff4f79..81ac16b717d 100644 --- a/lib/libssl/src/apps/dsaparam.c +++ b/lib/libssl/src/apps/dsaparam.c @@ -325,9 +325,9 @@ bad: len = BN_num_bytes(dsa->p); bits_p = BN_num_bits(dsa->p); - data = (unsigned char *)OPENSSL_malloc(len + 20); + data = (unsigned char *)malloc(len + 20); if (data == NULL) { - perror("OPENSSL_malloc"); + perror("malloc"); goto end; } l = BN_bn2bin(dsa->p, data); diff --git a/lib/libssl/src/apps/ec.c b/lib/libssl/src/apps/ec.c index dd3bb9d4a1d..b9be5d74fc7 100644 --- a/lib/libssl/src/apps/ec.c +++ b/lib/libssl/src/apps/ec.c @@ -385,9 +385,9 @@ end: if (eckey) EC_KEY_free(eckey); if (passin) - OPENSSL_free(passin); + free(passin); if (passout) - OPENSSL_free(passout); + free(passout); apps_shutdown(); OPENSSL_EXIT(ret); } diff --git a/lib/libssl/src/apps/ecparam.c b/lib/libssl/src/apps/ecparam.c index 17e28cf1d6e..e2b3beee6ff 100644 --- a/lib/libssl/src/apps/ecparam.c +++ b/lib/libssl/src/apps/ecparam.c @@ -342,14 +342,14 @@ bad: crv_len = EC_get_builtin_curves(NULL, 0); - curves = OPENSSL_malloc((int)(sizeof(EC_builtin_curve) * crv_len)); + curves = malloc((int)(sizeof(EC_builtin_curve) * crv_len)); if (curves == NULL) goto end; if (!EC_get_builtin_curves(curves, crv_len)) { - OPENSSL_free(curves); + free(curves); goto end; } @@ -369,7 +369,7 @@ bad: BIO_printf(out, "%s\n", comment); } - OPENSSL_free(curves); + free(curves); ret = 0; goto end; } @@ -480,7 +480,7 @@ bad: (ec_order = BN_new()) == NULL || (ec_cofactor = BN_new()) == NULL ) { - perror("OPENSSL_malloc"); + perror("malloc"); goto end; } @@ -529,11 +529,11 @@ bad: if ((tmp_len = (size_t)BN_num_bytes(ec_cofactor)) > buf_len) buf_len = tmp_len; - buffer = (unsigned char *)OPENSSL_malloc(buf_len); + buffer = (unsigned char *)malloc(buf_len); if (buffer == NULL) { - perror("OPENSSL_malloc"); + perror("malloc"); goto end; } @@ -681,7 +681,7 @@ end: if (ec_cofactor) BN_free(ec_cofactor); if (buffer) - OPENSSL_free(buffer); + free(buffer); if (in != NULL) BIO_free(in); if (out != NULL) diff --git a/lib/libssl/src/apps/enc.c b/lib/libssl/src/apps/enc.c index 16e98b8e531..22f431ff1a2 100644 --- a/lib/libssl/src/apps/enc.c +++ b/lib/libssl/src/apps/enc.c @@ -371,11 +371,11 @@ bad: if (verbose) BIO_printf(bio_err,"bufsize=%d\n",bsize); } - strbuf=OPENSSL_malloc(SIZE); - buff=(unsigned char *)OPENSSL_malloc(EVP_ENCODE_LENGTH(bsize)); + strbuf=malloc(SIZE); + buff=(unsigned char *)malloc(EVP_ENCODE_LENGTH(bsize)); if ((buff == NULL) || (strbuf == NULL)) { - BIO_printf(bio_err,"OPENSSL_malloc failure %ld\n",(long)EVP_ENCODE_LENGTH(bsize)); + BIO_printf(bio_err,"malloc failure %ld\n",(long)EVP_ENCODE_LENGTH(bsize)); goto end; } @@ -675,8 +675,8 @@ bad: } end: ERR_print_errors(bio_err); - if (strbuf != NULL) OPENSSL_free(strbuf); - if (buff != NULL) OPENSSL_free(buff); + if (strbuf != NULL) free(strbuf); + if (buff != NULL) free(buff); if (in != NULL) BIO_free(in); if (out != NULL) BIO_free_all(out); if (benc != NULL) BIO_free(benc); @@ -684,7 +684,7 @@ end: #ifdef ZLIB if (bzl != NULL) BIO_free(bzl); #endif - if(pass) OPENSSL_free(pass); + if(pass) free(pass); apps_shutdown(); OPENSSL_EXIT(ret); } diff --git a/lib/libssl/src/apps/engine.c b/lib/libssl/src/apps/engine.c index 33eeaf9f59a..be07889d600 100644 --- a/lib/libssl/src/apps/engine.c +++ b/lib/libssl/src/apps/engine.c @@ -104,7 +104,7 @@ static int append_buf(char **buf, const char *s, int *size, int step) if (*buf == NULL) { *size = step; - *buf = OPENSSL_malloc(*size); + *buf = malloc(*size); if (*buf == NULL) return 0; **buf = '\0'; @@ -116,7 +116,7 @@ static int append_buf(char **buf, const char *s, int *size, int step) if (strlen(*buf) + strlen(s) >= (unsigned int)*size) { *size += step; - *buf = OPENSSL_realloc(*buf, *size); + *buf = realloc(*buf, *size); } if (*buf == NULL) @@ -227,7 +227,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent if((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_LEN_FROM_CMD, num, NULL, NULL)) <= 0) goto err; - if((name = OPENSSL_malloc(len + 1)) == NULL) + if((name = malloc(len + 1)) == NULL) goto err; if(ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_FROM_CMD, num, name, NULL) <= 0) @@ -238,7 +238,7 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent goto err; if(len > 0) { - if((desc = OPENSSL_malloc(len + 1)) == NULL) + if((desc = malloc(len + 1)) == NULL) goto err; if(ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_FROM_CMD, num, desc, NULL) <= 0) @@ -274,8 +274,8 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent xpos = 0; } } - OPENSSL_free(name); name = NULL; - if(desc) { OPENSSL_free(desc); desc = NULL; } + free(name); name = NULL; + if(desc) { free(desc); desc = NULL; } /* Move to the next command */ num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE, num, NULL, NULL); @@ -285,8 +285,8 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent ret = 1; err: if(cmds) sk_OPENSSL_STRING_pop_free(cmds, identity); - if(name) OPENSSL_free(name); - if(desc) OPENSSL_free(desc); + if(name) free(name); + if(desc) free(desc); return ret; } @@ -496,7 +496,7 @@ skip_pmeths: if (cap_buf && (*cap_buf != '\0')) BIO_printf(bio_out, " [%s]\n", cap_buf); - OPENSSL_free(cap_buf); + free(cap_buf); } if(test_avail) { diff --git a/lib/libssl/src/apps/gendsa.c b/lib/libssl/src/apps/gendsa.c index 612bdfbc1db..5c9ec7d24b5 100644 --- a/lib/libssl/src/apps/gendsa.c +++ b/lib/libssl/src/apps/gendsa.c @@ -266,7 +266,7 @@ end: if (in != NULL) BIO_free(in); if (out != NULL) BIO_free_all(out); if (dsa != NULL) DSA_free(dsa); - if(passout) OPENSSL_free(passout); + if(passout) free(passout); apps_shutdown(); OPENSSL_EXIT(ret); } diff --git a/lib/libssl/src/apps/genpkey.c b/lib/libssl/src/apps/genpkey.c index 24b623a1bb3..f6b23ac5a64 100644 --- a/lib/libssl/src/apps/genpkey.c +++ b/lib/libssl/src/apps/genpkey.c @@ -301,7 +301,7 @@ int MAIN(int argc, char **argv) BIO_free_all(out); BIO_free(in); if (pass) - OPENSSL_free(pass); + free(pass); return ret; } diff --git a/lib/libssl/src/apps/genrsa.c b/lib/libssl/src/apps/genrsa.c index bdc8778b1d9..1be17d9ac62 100644 --- a/lib/libssl/src/apps/genrsa.c +++ b/lib/libssl/src/apps/genrsa.c @@ -298,7 +298,7 @@ err: if (bn) BN_free(bn); if (rsa) RSA_free(rsa); if (out) BIO_free_all(out); - if(passout) OPENSSL_free(passout); + if(passout) free(passout); if (ret != 0) ERR_print_errors(bio_err); apps_shutdown(); diff --git a/lib/libssl/src/apps/ocsp.c b/lib/libssl/src/apps/ocsp.c index e5edc3017d4..dff47ba41b6 100644 --- a/lib/libssl/src/apps/ocsp.c +++ b/lib/libssl/src/apps/ocsp.c @@ -917,9 +917,9 @@ end: if (use_ssl != -1) { - OPENSSL_free(host); - OPENSSL_free(port); - OPENSSL_free(path); + free(host); + free(port); + free(path); } OPENSSL_EXIT(ret); @@ -1165,7 +1165,7 @@ static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser) row[DB_serial] = itmp; BN_free(bn); rrow=TXT_DB_get_by_index(db->db,DB_serial,row); - OPENSSL_free(itmp); + free(itmp); return rrow; } diff --git a/lib/libssl/src/apps/openssl.c b/lib/libssl/src/apps/openssl.c index 8bd71082220..fd730ce97ef 100644 --- a/lib/libssl/src/apps/openssl.c +++ b/lib/libssl/src/apps/openssl.c @@ -374,14 +374,14 @@ int main(int Argc, char *ARGV[]) ret=1; end: if (to_free) - OPENSSL_free(to_free); + free(to_free); if (config != NULL) { NCONF_free(config); config=NULL; } if (prog != NULL) lh_FUNCTION_free(prog); - if (arg.data != NULL) OPENSSL_free(arg.data); + if (arg.data != NULL) free(arg.data); apps_shutdown(); diff --git a/lib/libssl/src/apps/passwd.c b/lib/libssl/src/apps/passwd.c index cb30f810c8f..b26bdbf4c72 100644 --- a/lib/libssl/src/apps/passwd.c +++ b/lib/libssl/src/apps/passwd.c @@ -211,7 +211,7 @@ int MAIN(int argc, char **argv) passwd_malloc_size = pw_maxlen + 2; /* longer than necessary so that we can warn about truncation */ - passwd = passwd_malloc = OPENSSL_malloc(passwd_malloc_size); + passwd = passwd_malloc = malloc(passwd_malloc_size); if (passwd_malloc == NULL) goto err; } @@ -278,9 +278,9 @@ int MAIN(int argc, char **argv) err: ERR_print_errors(bio_err); if (salt_malloc) - OPENSSL_free(salt_malloc); + free(salt_malloc); if (passwd_malloc) - OPENSSL_free(passwd_malloc); + free(passwd_malloc); if (in) BIO_free(in); if (out) @@ -425,7 +425,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p, { if (*salt_malloc_p == NULL) { - *salt_p = *salt_malloc_p = OPENSSL_malloc(3); + *salt_p = *salt_malloc_p = malloc(3); if (*salt_malloc_p == NULL) goto err; } @@ -444,7 +444,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p, if (*salt_malloc_p == NULL) { - *salt_p = *salt_malloc_p = OPENSSL_malloc(9); + *salt_p = *salt_malloc_p = malloc(9); if (*salt_malloc_p == NULL) goto err; } diff --git a/lib/libssl/src/apps/pkcs12.c b/lib/libssl/src/apps/pkcs12.c index f099e8f6187..97947186750 100644 --- a/lib/libssl/src/apps/pkcs12.c +++ b/lib/libssl/src/apps/pkcs12.c @@ -689,8 +689,8 @@ int MAIN(int argc, char **argv) BIO_free(in); BIO_free_all(out); if (canames) sk_OPENSSL_STRING_free(canames); - if(passin) OPENSSL_free(passin); - if(passout) OPENSSL_free(passout); + if(passin) free(passin); + if(passout) free(passout); apps_shutdown(); OPENSSL_EXIT(ret); } @@ -927,7 +927,7 @@ int print_attribs (BIO *out, STACK_OF(X509_ATTRIBUTE) *attrlst,const char *name) value = OPENSSL_uni2asc(av->value.bmpstring->data, av->value.bmpstring->length); BIO_printf(out, "%s\n", value); - OPENSSL_free(value); + free(value); break; case V_ASN1_OCTET_STRING: diff --git a/lib/libssl/src/apps/pkcs8.c b/lib/libssl/src/apps/pkcs8.c index 90b2ebe3ef7..74fe9a1b3d7 100644 --- a/lib/libssl/src/apps/pkcs8.c +++ b/lib/libssl/src/apps/pkcs8.c @@ -425,9 +425,9 @@ int MAIN(int argc, char **argv) BIO_free_all(out); BIO_free(in); if (passin) - OPENSSL_free(passin); + free(passin); if (passout) - OPENSSL_free(passout); + free(passout); return ret; } diff --git a/lib/libssl/src/apps/pkey.c b/lib/libssl/src/apps/pkey.c index a55714d0cef..82c67b732bd 100644 --- a/lib/libssl/src/apps/pkey.c +++ b/lib/libssl/src/apps/pkey.c @@ -270,9 +270,9 @@ int MAIN(int argc, char **argv) BIO_free_all(out); BIO_free(in); if (passin) - OPENSSL_free(passin); + free(passin); if (passout) - OPENSSL_free(passout); + free(passout); return ret; } diff --git a/lib/libssl/src/apps/pkeyutl.c b/lib/libssl/src/apps/pkeyutl.c index 8b260caae05..3627839e05f 100644 --- a/lib/libssl/src/apps/pkeyutl.c +++ b/lib/libssl/src/apps/pkeyutl.c @@ -338,7 +338,7 @@ int MAIN(int argc, char **argv) buf_in, (size_t)buf_inlen); if (rv > 0) { - buf_out = OPENSSL_malloc(buf_outlen); + buf_out = malloc(buf_outlen); if (!buf_out) rv = -1; else @@ -371,11 +371,11 @@ int MAIN(int argc, char **argv) BIO_free(in); BIO_free_all(out); if (buf_in) - OPENSSL_free(buf_in); + free(buf_in); if (buf_out) - OPENSSL_free(buf_out); + free(buf_out); if (sig) - OPENSSL_free(sig); + free(sig); return ret; } @@ -497,7 +497,7 @@ static EVP_PKEY_CTX *init_ctx(int *pkeysize, end: if (passin) - OPENSSL_free(passin); + free(passin); return ctx; diff --git a/lib/libssl/src/apps/prime.c b/lib/libssl/src/apps/prime.c index 031906a792b..690f03ef324 100644 --- a/lib/libssl/src/apps/prime.c +++ b/lib/libssl/src/apps/prime.c @@ -127,7 +127,7 @@ int MAIN(int argc, char **argv) BN_generate_prime_ex(bn,bits,safe,NULL,NULL,NULL); s=hex ? BN_bn2hex(bn) : BN_bn2dec(bn); BIO_printf(bio_out,"%s\n",s); - OPENSSL_free(s); + free(s); } else { diff --git a/lib/libssl/src/apps/req.c b/lib/libssl/src/apps/req.c index 66038905a2c..3374626e63d 100644 --- a/lib/libssl/src/apps/req.c +++ b/lib/libssl/src/apps/req.c @@ -1068,7 +1068,7 @@ loop: end: #ifndef MONOLITH if(to_free) - OPENSSL_free(to_free); + free(to_free); #endif if (ex) { @@ -1089,12 +1089,12 @@ end: ENGINE_free(gen_eng); #endif if (keyalgstr) - OPENSSL_free(keyalgstr); + free(keyalgstr); X509_REQ_free(req); X509_free(x509ss); ASN1_INTEGER_free(serial); - if(passargin && passin) OPENSSL_free(passin); - if(passargout && passout) OPENSSL_free(passout); + if(passargin && passin) free(passin); + if(passargout && passout) free(passout); OBJ_cleanup(); apps_shutdown(); OPENSSL_EXIT(ex); diff --git a/lib/libssl/src/apps/rsa.c b/lib/libssl/src/apps/rsa.c index 579c2e276a9..63522676712 100644 --- a/lib/libssl/src/apps/rsa.c +++ b/lib/libssl/src/apps/rsa.c @@ -382,7 +382,7 @@ bad: i=1; size=i2d_RSA_NET(rsa,NULL,NULL, sgckey); - if ((p=(unsigned char *)OPENSSL_malloc(size)) == NULL) + if ((p=(unsigned char *)malloc(size)) == NULL) { BIO_printf(bio_err,"Memory allocation failure\n"); goto end; @@ -390,7 +390,7 @@ bad: pp=p; i2d_RSA_NET(rsa,&p,NULL, sgckey); BIO_write(out,(char *)pp,size); - OPENSSL_free(pp); + free(pp); } #endif else if (outformat == FORMAT_PEM) { @@ -430,8 +430,8 @@ bad: end: if(out != NULL) BIO_free_all(out); if(rsa != NULL) RSA_free(rsa); - if(passin) OPENSSL_free(passin); - if(passout) OPENSSL_free(passout); + if(passin) free(passin); + if(passout) free(passout); apps_shutdown(); OPENSSL_EXIT(ret); } diff --git a/lib/libssl/src/apps/rsautl.c b/lib/libssl/src/apps/rsautl.c index 49903496f58..ba9758c94b2 100644 --- a/lib/libssl/src/apps/rsautl.c +++ b/lib/libssl/src/apps/rsautl.c @@ -251,8 +251,8 @@ int MAIN(int argc, char **argv) keysize = RSA_size(rsa); - rsa_in = OPENSSL_malloc(keysize * 2); - rsa_out = OPENSSL_malloc(keysize); + rsa_in = malloc(keysize * 2); + rsa_out = malloc(keysize); /* Read the input data */ rsa_inlen = BIO_read(in, rsa_in, keysize * 2); @@ -305,9 +305,9 @@ int MAIN(int argc, char **argv) RSA_free(rsa); BIO_free(in); BIO_free_all(out); - if(rsa_in) OPENSSL_free(rsa_in); - if(rsa_out) OPENSSL_free(rsa_out); - if(passin) OPENSSL_free(passin); + if(rsa_in) free(rsa_in); + if(rsa_out) free(rsa_out); + if(passin) free(passin); return ret; } diff --git a/lib/libssl/src/apps/s_cb.c b/lib/libssl/src/apps/s_cb.c index 1d6a5183c46..8e702075e0c 100644 --- a/lib/libssl/src/apps/s_cb.c +++ b/lib/libssl/src/apps/s_cb.c @@ -784,7 +784,7 @@ int generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned int *cook OPENSSL_assert(0); break; } - buffer = OPENSSL_malloc(length); + buffer = malloc(length); if (buffer == NULL) { @@ -820,7 +820,7 @@ int generate_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned int *cook /* Calculate HMAC of buffer using the secret */ HMAC(EVP_sha1(), cookie_secret, COOKIE_SECRET_LENGTH, buffer, length, result, &resultlength); - OPENSSL_free(buffer); + free(buffer); memcpy(cookie, result, resultlength); *cookie_len = resultlength; @@ -865,7 +865,7 @@ int verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned int cookie_ OPENSSL_assert(0); break; } - buffer = OPENSSL_malloc(length); + buffer = malloc(length); if (buffer == NULL) { @@ -901,7 +901,7 @@ int verify_cookie_callback(SSL *ssl, unsigned char *cookie, unsigned int cookie_ /* Calculate HMAC of buffer using the secret */ HMAC(EVP_sha1(), cookie_secret, COOKIE_SECRET_LENGTH, buffer, length, result, &resultlength); - OPENSSL_free(buffer); + free(buffer); if (cookie_len == resultlength && memcmp(result, cookie, resultlength) == 0) return 1; diff --git a/lib/libssl/src/apps/s_client.c b/lib/libssl/src/apps/s_client.c index 637e85e570c..a163ac9904c 100644 --- a/lib/libssl/src/apps/s_client.c +++ b/lib/libssl/src/apps/s_client.c @@ -475,7 +475,7 @@ static int ssl_srp_verify_param_cb(SSL *s, void *arg) static char * ssl_give_srp_client_pwd_cb(SSL *s, void *arg) { SRP_ARG *srp_arg = (SRP_ARG *)arg; - char *pass = (char *)OPENSSL_malloc(PWD_STRLEN+1); + char *pass = (char *)malloc(PWD_STRLEN+1); PW_CB_DATA cb_tmp; int l; @@ -484,7 +484,7 @@ static char * ssl_give_srp_client_pwd_cb(SSL *s, void *arg) if ((l = password_callback(pass, PWD_STRLEN, 0, &cb_tmp))<0) { BIO_printf (bio_err, "Can't read Password\n"); - OPENSSL_free(pass); + free(pass); return NULL; } *(pass+l)= '\0'; @@ -628,9 +628,9 @@ int MAIN(int argc, char **argv) if (!load_config(bio_err, NULL)) goto end; - if ( ((cbuf=OPENSSL_malloc(BUFSIZZ)) == NULL) || - ((sbuf=OPENSSL_malloc(BUFSIZZ)) == NULL) || - ((mbuf=OPENSSL_malloc(BUFSIZZ + 1)) == NULL)) /* NUL byte */ + if ( ((cbuf=malloc(BUFSIZZ)) == NULL) || + ((sbuf=malloc(BUFSIZZ)) == NULL) || + ((mbuf=malloc(BUFSIZZ + 1)) == NULL)) /* NUL byte */ { BIO_printf(bio_err,"out of memory\n"); goto end; @@ -1842,7 +1842,7 @@ end: } #if !defined(OPENSSL_NO_TLSEXT) && !defined(OPENSSL_NO_NEXTPROTONEG) if (next_proto.data) - OPENSSL_free(next_proto.data); + free(next_proto.data); #endif if (ctx != NULL) SSL_CTX_free(ctx); if (cert) @@ -1850,12 +1850,12 @@ end: if (key) EVP_PKEY_free(key); if (pass) - OPENSSL_free(pass); + free(pass); if (vpm) X509_VERIFY_PARAM_free(vpm); - if (cbuf != NULL) { OPENSSL_cleanse(cbuf,BUFSIZZ); OPENSSL_free(cbuf); } - if (sbuf != NULL) { OPENSSL_cleanse(sbuf,BUFSIZZ); OPENSSL_free(sbuf); } - if (mbuf != NULL) { OPENSSL_cleanse(mbuf,BUFSIZZ); OPENSSL_free(mbuf); } + if (cbuf != NULL) { OPENSSL_cleanse(cbuf,BUFSIZZ); free(cbuf); } + if (sbuf != NULL) { OPENSSL_cleanse(sbuf,BUFSIZZ); free(sbuf); } + if (mbuf != NULL) { OPENSSL_cleanse(mbuf,BUFSIZZ); free(mbuf); } if (bio_c_out != NULL) { BIO_free(bio_c_out); @@ -2033,7 +2033,7 @@ static void print_stuff(BIO *bio, SSL *s, int full) BIO_printf(bio, "Keying material exporter:\n"); BIO_printf(bio, " Label: '%s'\n", keymatexportlabel); BIO_printf(bio, " Length: %i bytes\n", keymatexportlen); - exportedkeymat = OPENSSL_malloc(keymatexportlen); + exportedkeymat = malloc(keymatexportlen); if (exportedkeymat != NULL) { if (!SSL_export_keying_material(s, exportedkeymat, @@ -2052,7 +2052,7 @@ static void print_stuff(BIO *bio, SSL *s, int full) exportedkeymat[i]); BIO_printf(bio, "\n"); } - OPENSSL_free(exportedkeymat); + free(exportedkeymat); } } BIO_printf(bio,"---\n"); diff --git a/lib/libssl/src/apps/s_server.c b/lib/libssl/src/apps/s_server.c index 74cd2c83b3c..1a2b9804efb 100644 --- a/lib/libssl/src/apps/s_server.c +++ b/lib/libssl/src/apps/s_server.c @@ -710,9 +710,9 @@ BIO_printf(err, "cert_status: received %d ids\n", sk_OCSP_RESPID_num(ids)); ERR_print_errors(err); if (aia) { - OPENSSL_free(host); - OPENSSL_free(path); - OPENSSL_free(port); + free(host); + free(path); + free(port); X509_email_free(aia); } if (id) @@ -1720,18 +1720,18 @@ end: if (s_dkey) EVP_PKEY_free(s_dkey); if (pass) - OPENSSL_free(pass); + free(pass); if (dpass) - OPENSSL_free(dpass); + free(dpass); if (vpm) X509_VERIFY_PARAM_free(vpm); #ifndef OPENSSL_NO_TLSEXT if (tlscstatp.host) - OPENSSL_free(tlscstatp.host); + free(tlscstatp.host); if (tlscstatp.port) - OPENSSL_free(tlscstatp.port); + free(tlscstatp.port); if (tlscstatp.path) - OPENSSL_free(tlscstatp.path); + free(tlscstatp.path); if (ctx2 != NULL) SSL_CTX_free(ctx2); if (s_cert2) X509_free(s_cert2); @@ -1791,7 +1791,7 @@ static int sv_body(char *hostname, int s, unsigned char *context) struct timeval *timeoutp; #endif - if ((buf=OPENSSL_malloc(bufsize)) == NULL) + if ((buf=malloc(bufsize)) == NULL) { BIO_printf(bio_err,"out of memory\n"); goto err; @@ -2162,7 +2162,7 @@ err: if (buf != NULL) { OPENSSL_cleanse(buf,bufsize); - OPENSSL_free(buf); + free(buf); } if (ret >= 0) BIO_printf(bio_s_out,"ACCEPT\n"); @@ -2288,7 +2288,7 @@ static int init_ssl_connection(SSL *con) BIO_printf(bio_s_out, " Label: '%s'\n", keymatexportlabel); BIO_printf(bio_s_out, " Length: %i bytes\n", keymatexportlen); - exportedkeymat = OPENSSL_malloc(keymatexportlen); + exportedkeymat = malloc(keymatexportlen); if (exportedkeymat != NULL) { if (!SSL_export_keying_material(con, exportedkeymat, @@ -2307,7 +2307,7 @@ static int init_ssl_connection(SSL *con) exportedkeymat[i]); BIO_printf(bio_s_out, "\n"); } - OPENSSL_free(exportedkeymat); + free(exportedkeymat); } } @@ -2365,7 +2365,7 @@ static int www_body(char *hostname, int s, unsigned char *context) KSSL_CTX *kctx; #endif - buf=OPENSSL_malloc(bufsize); + buf=malloc(bufsize); if (buf == NULL) return(0); io=BIO_new(BIO_f_buffer()); ssl_bio=BIO_new(BIO_f_ssl()); @@ -2743,7 +2743,7 @@ err: if (ret >= 0) BIO_printf(bio_s_out,"ACCEPT\n"); - if (buf != NULL) OPENSSL_free(buf); + if (buf != NULL) free(buf); if (io != NULL) BIO_free_all(io); /* if (ssl_bio != NULL) BIO_free(ssl_bio);*/ return(ret); diff --git a/lib/libssl/src/apps/s_socket.c b/lib/libssl/src/apps/s_socket.c index 73dcdfd0a39..07f9934b327 100644 --- a/lib/libssl/src/apps/s_socket.c +++ b/lib/libssl/src/apps/s_socket.c @@ -222,7 +222,7 @@ int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, uns else sock = accept_socket; i=(*cb)(name,sock, context); - if (name != NULL) OPENSSL_free(name); + if (name != NULL) free(name); if (type==SOCK_STREAM) { shutdown(sock, SHUT_RDWR); close(sock); @@ -358,9 +358,9 @@ redoit: } else { - if ((*host=(char *)OPENSSL_malloc(strlen(h1->h_name)+1)) == NULL) + if ((*host=(char *)malloc(strlen(h1->h_name)+1)) == NULL) { - perror("OPENSSL_malloc"); + perror("malloc"); return(0); } BUF_strlcpy(*host,h1->h_name,strlen(h1->h_name)+1); diff --git a/lib/libssl/src/apps/smime.c b/lib/libssl/src/apps/smime.c index cd08fe44648..4421e948bb4 100644 --- a/lib/libssl/src/apps/smime.c +++ b/lib/libssl/src/apps/smime.c @@ -813,7 +813,7 @@ end: BIO_free(in); BIO_free(indata); BIO_free_all(out); - if (passin) OPENSSL_free(passin); + if (passin) free(passin); return (ret); } diff --git a/lib/libssl/src/apps/speed.c b/lib/libssl/src/apps/speed.c index 72aa867ae49..acae09e95e9 100644 --- a/lib/libssl/src/apps/speed.c +++ b/lib/libssl/src/apps/speed.c @@ -618,12 +618,12 @@ int MAIN(int argc, char **argv) rsa_key[i]=NULL; #endif - if ((buf=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL) + if ((buf=(unsigned char *)malloc((int)BUFSIZE)) == NULL) { BIO_printf(bio_err,"out of memory\n"); goto end; } - if ((buf2=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL) + if ((buf2=(unsigned char *)malloc((int)BUFSIZE)) == NULL) { BIO_printf(bio_err,"out of memory\n"); goto end; @@ -2493,8 +2493,8 @@ show_res: end: ERR_print_errors(bio_err); - if (buf != NULL) OPENSSL_free(buf); - if (buf2 != NULL) OPENSSL_free(buf2); + if (buf != NULL) free(buf); + if (buf2 != NULL) free(buf2); #ifndef OPENSSL_NO_RSA for (i=0; i<RSA_NUM; i++) if (rsa_key[i] != NULL) diff --git a/lib/libssl/src/apps/spkac.c b/lib/libssl/src/apps/spkac.c index 7b90825b215..8d29dce907b 100644 --- a/lib/libssl/src/apps/spkac.c +++ b/lib/libssl/src/apps/spkac.c @@ -217,7 +217,7 @@ bad: goto end; } BIO_printf(out, "SPKAC=%s\n", spkstr); - OPENSSL_free(spkstr); + free(spkstr); ret = 0; goto end; } @@ -290,7 +290,7 @@ end: BIO_free(in); BIO_free_all(out); EVP_PKEY_free(pkey); - if(passin) OPENSSL_free(passin); + if(passin) free(passin); apps_shutdown(); OPENSSL_EXIT(ret); } diff --git a/lib/libssl/src/apps/srp.c b/lib/libssl/src/apps/srp.c index 7004fea7ff2..15f3315c188 100644 --- a/lib/libssl/src/apps/srp.c +++ b/lib/libssl/src/apps/srp.c @@ -179,7 +179,7 @@ static int update_index(CA_DB *db, BIO *bio, char **row) char ** irow; int i; - if ((irow=(char **)OPENSSL_malloc(sizeof(char *)*(DB_NUMBER+1))) == NULL) + if ((irow=(char **)malloc(sizeof(char *)*(DB_NUMBER+1))) == NULL) { BIO_printf(bio_err,"Memory allocation failure\n"); return 0; @@ -196,7 +196,7 @@ static int update_index(CA_DB *db, BIO *bio, char **row) { BIO_printf(bio,"failed to update srpvfile\n"); BIO_printf(bio,"TXT_DB error number %ld\n",db->db->error); - OPENSSL_free(irow); + free(irow); return 0; } return 1; @@ -233,7 +233,7 @@ static char *srp_verify_user(const char *user, const char *srp_verifier, { if (strcmp(verifier, srp_verifier)) gNid = NULL; - OPENSSL_free(verifier); + free(verifier); } } return gNid; @@ -444,7 +444,7 @@ bad: size_t len; len = strlen(s)+sizeof(CONFIG_FILE)+1; - tofree=OPENSSL_malloc(len); + tofree=malloc(len); BUF_strlcpy(tofree,s,len); BUF_strlcat(tofree,"/",len); BUF_strlcat(tofree,CONFIG_FILE,len); @@ -465,7 +465,7 @@ bad: } if(tofree) { - OPENSSL_free(tofree); + free(tofree); tofree = NULL; } @@ -607,12 +607,12 @@ bad: (userinfo && (!(row[DB_srpinfo] = BUF_strdup(userinfo)))) || !update_index(db, bio_err, row)) { - if (row[DB_srpid]) OPENSSL_free(row[DB_srpid]); - if (row[DB_srpgN]) OPENSSL_free(row[DB_srpgN]); - if (row[DB_srpinfo]) OPENSSL_free(row[DB_srpinfo]); - if (row[DB_srptype]) OPENSSL_free(row[DB_srptype]); - if (row[DB_srpverifier]) OPENSSL_free(row[DB_srpverifier]); - if (row[DB_srpsalt]) OPENSSL_free(row[DB_srpsalt]); + if (row[DB_srpid]) free(row[DB_srpid]); + if (row[DB_srpgN]) free(row[DB_srpgN]); + if (row[DB_srpinfo]) free(row[DB_srpinfo]); + if (row[DB_srptype]) free(row[DB_srptype]); + if (row[DB_srpverifier]) free(row[DB_srpverifier]); + if (row[DB_srpsalt]) free(row[DB_srpsalt]); goto err; } doupdatedb = 1; @@ -733,7 +733,7 @@ err: VERBOSE BIO_printf(bio_err,"SRP terminating with code %d.\n",ret); if(tofree) - OPENSSL_free(tofree); + free(tofree); if (ret) ERR_print_errors(bio_err); if (randfile) app_RAND_write_file(randfile, bio_err); if (conf) NCONF_free(conf); diff --git a/lib/libssl/src/apps/ts.c b/lib/libssl/src/apps/ts.c index e066a497ca3..9528631e922 100644 --- a/lib/libssl/src/apps/ts.c +++ b/lib/libssl/src/apps/ts.c @@ -389,7 +389,7 @@ int MAIN(int argc, char **argv) /* Clean up. */ app_RAND_write_file(NULL, bio_err); NCONF_free(conf); - OPENSSL_free(password); + free(password); OBJ_cleanup(); if (free_bio_err) { @@ -589,7 +589,7 @@ static TS_REQ *create_query(BIO *data_bio, char *digest, const EVP_MD *md, } TS_MSG_IMPRINT_free(msg_imprint); X509_ALGOR_free(algo); - OPENSSL_free(data); + free(data); ASN1_OBJECT_free(policy_obj); ASN1_INTEGER_free(nonce_asn1); return ts_req; @@ -610,7 +610,7 @@ static int create_digest(BIO *input, char *digest, const EVP_MD *md, unsigned char buffer[4096]; int length; - *md_value = OPENSSL_malloc(md_value_len); + *md_value = malloc(md_value_len); if (*md_value == 0) goto err; EVP_DigestInit(&md_ctx, md); @@ -627,7 +627,7 @@ static int create_digest(BIO *input, char *digest, const EVP_MD *md, *md_value = string_to_hex(digest, &digest_len); if (!*md_value || md_value_len != digest_len) { - OPENSSL_free(*md_value); + free(*md_value); *md_value = NULL; BIO_printf(bio_err, "bad digest, %d bytes " "must be specified\n", md_value_len); @@ -654,10 +654,10 @@ static ASN1_INTEGER *create_nonce(int bits) /* Find the first non-zero byte and creating ASN1_INTEGER object. */ for (i = 0; i < len && !buf[i]; ++i); if (!(nonce = ASN1_INTEGER_new())) goto err; - OPENSSL_free(nonce->data); + free(nonce->data); /* Allocate at least one byte. */ nonce->length = len - i; - if (!(nonce->data = OPENSSL_malloc(nonce->length + 1))) goto err; + if (!(nonce->data = malloc(nonce->length + 1))) goto err; memcpy(nonce->data, buf + i, nonce->length); return nonce; diff --git a/lib/libssl/src/apps/x509.c b/lib/libssl/src/apps/x509.c index 2ed3f13327c..4e5ce377500 100644 --- a/lib/libssl/src/apps/x509.c +++ b/lib/libssl/src/apps/x509.c @@ -858,7 +858,7 @@ bad: BIO_printf(STDout,"/* issuer :%s */\n",buf); z=i2d_X509(x,NULL); - m=OPENSSL_malloc(z); + m=malloc(z); d=(unsigned char *)m; z=i2d_X509_NAME(X509_get_subject_name(x),&d); @@ -896,7 +896,7 @@ bad: if (y%16 != 0) BIO_printf(STDout,"\n"); BIO_printf(STDout,"};\n"); - OPENSSL_free(m); + free(m); } else if (text == i) { @@ -1087,7 +1087,7 @@ end: ASN1_INTEGER_free(sno); sk_ASN1_OBJECT_pop_free(trust, ASN1_OBJECT_free); sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free); - if (passin) OPENSSL_free(passin); + if (passin) free(passin); apps_shutdown(); OPENSSL_EXIT(ret); } @@ -1102,7 +1102,7 @@ static ASN1_INTEGER *x509_load_serial(char *CAfile, char *serialfile, int create len = ((serialfile == NULL) ?(strlen(CAfile)+strlen(POSTFIX)+1) :(strlen(serialfile)))+1; - buf=OPENSSL_malloc(len); + buf=malloc(len); if (buf == NULL) { BIO_printf(bio_err,"out of mem\n"); goto end; } if (serialfile == NULL) { @@ -1127,7 +1127,7 @@ static ASN1_INTEGER *x509_load_serial(char *CAfile, char *serialfile, int create if (!save_serial(buf, NULL, serial, &bs)) goto end; end: - if (buf) OPENSSL_free(buf); + if (buf) free(buf); BN_free(serial); return bs; } |