RubyGems - grpc - Versions diffs - 1.27.0.pre1 → 1.30.1 - Mend

grpc 1.27.0.pre1 → 1.30.1

Potentially problematic release.

This version of grpc might be problematic. Click here for more details.

Files changed (972) hide show

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/a_digest.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/a_sign.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/a_strex.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/a_verify.c RENAMED

@@ -61,7 +61,6 @@
 #include <sys/types.h>
 #include <openssl/bn.h>
-#include <openssl/buf.h>
 #include <openssl/digest.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/algorithm.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/asn1_gen.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/by_dir.c RENAMED

@@ -236,7 +236,7 @@ static int add_cert_dir(BY_DIR *ctx, const char *dir, int type)
                 by_dir_entry_free(ent);
                 return 0;
             }
-            BUF_strlcpy(ent->dir, ss, len + 1);
+            OPENSSL_strlcpy(ent->dir, ss, len + 1);
             if (!sk_BY_DIR_ENTRY_push(ctx->dirs, ent)) {
                 by_dir_entry_free(ent);
                 return 0;

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/by_file.c RENAMED

@@ -57,7 +57,6 @@
 #include <stdlib.h>
-#include <openssl/buf.h>
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/thread.h>

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/charmap.h RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/i2d_pr.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/internal.h RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/rsa_pss.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/t_crl.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/t_req.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/t_x509.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/t_x509a.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/vpm_int.h RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_att.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_cmp.c RENAMED

@@ -58,7 +58,6 @@
 #include <string.h>
 #include <openssl/asn1.h>
-#include <openssl/buf.h>
 #include <openssl/digest.h>
 #include <openssl/err.h>
 #include <openssl/mem.h>

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_d2.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_def.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_ext.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_lu.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_obj.c RENAMED

@@ -101,7 +101,7 @@ char *X509_NAME_oneline(X509_NAME *a, char *buf, int len)
             buf = b->data;
             OPENSSL_free(b);
         }
-        BUF_strlcpy(buf, "NO X509_NAME", len);
+        OPENSSL_strlcpy(buf, "NO X509_NAME", len);
         return buf;
     }

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_r2x.c RENAMED

@@ -56,7 +56,6 @@
 #include <openssl/asn1.h>
 #include <openssl/bn.h>
-#include <openssl/buf.h>
 #include <openssl/digest.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_req.c RENAMED

@@ -58,7 +58,6 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/bn.h>
-#include <openssl/buf.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/mem.h>

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_set.c RENAMED

@@ -129,6 +129,14 @@ const ASN1_TIME *X509_get0_notBefore(const X509 *x)
     return x->cert_info->validity->notBefore;
 }
+ASN1_TIME *X509_getm_notBefore(X509 *x)
+{
+    // Note this function takes a const |X509| pointer in OpenSSL. We require
+    // non-const as this allows mutating |x|. If it comes up for compatibility,
+    // we can relax this.
+    return x->cert_info->validity->notBefore;
+}
 int X509_set_notAfter(X509 *x, const ASN1_TIME *tm)
 {
     ASN1_TIME *in;
@@ -151,6 +159,14 @@ const ASN1_TIME *X509_get0_notAfter(const X509 *x)
     return x->cert_info->validity->notAfter;
 }
+ASN1_TIME *X509_getm_notAfter(X509 *x)
+{
+    // Note this function takes a const |X509| pointer in OpenSSL. We require
+    // non-const as this allows mutating |x|. If it comes up for compatibility,
+    // we can relax this.
+    return x->cert_info->validity->notAfter;
+}
 int X509_set_pubkey(X509 *x, EVP_PKEY *pkey)
 {
     if ((x == NULL) || (x->cert_info == NULL))

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_trs.c RENAMED

@@ -54,7 +54,6 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
-#include <openssl/buf.h>
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/obj.h>
@@ -201,7 +200,7 @@ int X509_TRUST_add(int id, int flags, int (*ck) (X509_TRUST *, X509 *, int),
         trtmp = X509_TRUST_get0(idx);
     /* Duplicate the supplied name. */
-    name_dup = BUF_strdup(name);
+    name_dup = OPENSSL_strdup(name);
     if (name_dup == NULL) {
         OPENSSL_PUT_ERROR(X509, ERR_R_MALLOC_FAILURE);
         if (idx == -1)

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_txt.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_v3.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_vfy.c RENAMED

@@ -59,7 +59,6 @@
 #include <time.h>
 #include <openssl/asn1.h>
-#include <openssl/buf.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/mem.h>
@@ -2149,6 +2148,11 @@ STACK_OF(X509) *X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx)
     return ctx->chain;
 }
+STACK_OF(X509) *X509_STORE_CTX_get0_chain(X509_STORE_CTX *ctx)
+{
+    return ctx->chain;
+}
 STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *ctx)
 {
     if (!ctx->chain)

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509_vpm.c RENAMED

@@ -56,7 +56,6 @@
 #include <string.h>
-#include <openssl/buf.h>
 #include <openssl/mem.h>
 #include <openssl/obj.h>
 #include <openssl/stack.h>
@@ -106,7 +105,7 @@ static int int_x509_param_set_hosts(X509_VERIFY_PARAM_ID *id, int mode,
         id->hosts = NULL;
     }
-    copy = BUF_strndup(name, namelen);
+    copy = OPENSSL_strndup(name, namelen);
     if (copy == NULL)
         return 0;
@@ -345,7 +344,7 @@ static int int_x509_param_set1(char **pdest, size_t *pdestlen,
         return 0;
     }
-    tmp = BUF_memdup(src, srclen);
+    tmp = OPENSSL_memdup(src, srclen);
     if (!tmp) {
         return 0;
     }
@@ -362,7 +361,7 @@ int X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name)
 {
     if (param->name)
         OPENSSL_free(param->name);
-    param->name = BUF_strdup(name);
+    param->name = OPENSSL_strdup(name);
     if (param->name)
         return 1;
     return 0;

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509cset.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509name.c RENAMED

@@ -177,7 +177,7 @@ X509_NAME_ENTRY *X509_NAME_delete_entry(X509_NAME *name, int loc)
 }
 int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type,
-                               unsigned char *bytes, int len, int loc,
+                               const unsigned char *bytes, int len, int loc,
                                int set)
 {
     X509_NAME_ENTRY *ne;
@@ -191,7 +191,7 @@ int X509_NAME_add_entry_by_OBJ(X509_NAME *name, ASN1_OBJECT *obj, int type,
 }
 int X509_NAME_add_entry_by_NID(X509_NAME *name, int nid, int type,
-                               unsigned char *bytes, int len, int loc,
+                               const unsigned char *bytes, int len, int loc,
                                int set)
 {
     X509_NAME_ENTRY *ne;
@@ -298,7 +298,8 @@ X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_txt(X509_NAME_ENTRY **ne,
 }
 X509_NAME_ENTRY *X509_NAME_ENTRY_create_by_NID(X509_NAME_ENTRY **ne, int nid,
-                                               int type, unsigned char *bytes,
+                                               int type,
+                                               const unsigned char *bytes,
                                                int len)
 {
     const ASN1_OBJECT *obj = OBJ_nid2obj(nid);

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509rset.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x509spki.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_algor.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_all.c RENAMED

@@ -59,7 +59,6 @@
 #include <limits.h>
 #include <openssl/asn1.h>
-#include <openssl/buf.h>
 #include <openssl/digest.h>
 #include <openssl/dsa.h>
 #include <openssl/evp.h>

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_attrib.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_crl.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_exten.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_info.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_name.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_pkey.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_pubkey.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_req.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_sig.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_spki.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_val.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_x509.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509/x_x509a.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/ext_dat.h RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/internal.h RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/pcy_cache.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/pcy_data.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/pcy_int.h RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/pcy_lib.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/pcy_map.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/pcy_node.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/pcy_tree.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_akey.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_akeya.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_alt.c RENAMED

@@ -169,9 +169,9 @@ STACK_OF(CONF_VALUE) *i2v_GENERAL_NAME(X509V3_EXT_METHOD *method,
             for (i = 0; i < 8; i++) {
                 BIO_snprintf(htmp, sizeof htmp, "%X", p[0] << 8 | p[1]);
                 p += 2;
-                BUF_strlcat(oline, htmp, sizeof(oline));
+                OPENSSL_strlcat(oline, htmp, sizeof(oline));
                 if (i != 7)
-                    BUF_strlcat(oline, ":", sizeof(oline));
+                    OPENSSL_strlcat(oline, ":", sizeof(oline));
             }
         } else {
             if (!X509V3_add_value("IP Address", "<invalid>", &ret))
@@ -594,7 +594,7 @@ static int do_othername(GENERAL_NAME *gen, char *value, X509V3_CTX *ctx)
     objtmp = OPENSSL_malloc(objlen + 1);
     if (objtmp == NULL)
         return 0;
-    BUF_strlcpy(objtmp, value, objlen + 1);
+    OPENSSL_strlcpy(objtmp, value, objlen + 1);
     gen->d.otherName->type_id = OBJ_txt2obj(objtmp, 0);
     OPENSSL_free(objtmp);
     if (!gen->d.otherName->type_id)

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_bcons.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_bitst.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_conf.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_cpols.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_crld.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_enum.c RENAMED

@@ -57,8 +57,8 @@
 #include <stdio.h>
-#include <openssl/buf.h>
 #include <openssl/obj.h>
+#include <openssl/mem.h>
 #include <openssl/x509v3.h>
 static const ENUMERATED_NAMES crl_reasons[] = {
@@ -94,7 +94,7 @@ char *i2s_ASN1_ENUMERATED_TABLE(X509V3_EXT_METHOD *method, ASN1_ENUMERATED *e)
     strval = ASN1_ENUMERATED_get(e);
     for (enam = method->usr_data; enam->lname; enam++) {
         if (strval == enam->bitnum)
-            return BUF_strdup(enam->lname);
+            return OPENSSL_strdup(enam->lname);
     }
     return i2s_ASN1_ENUMERATED(method, e);
 }

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_extku.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_genn.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_ia5.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_info.c RENAMED

@@ -62,7 +62,6 @@
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
-#include <openssl/buf.h>
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include <openssl/mem.h>
@@ -137,9 +136,9 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(
         ntmp = OPENSSL_malloc(nlen);
         if (ntmp == NULL)
             goto err;
-        BUF_strlcpy(ntmp, objtmp, nlen);
-        BUF_strlcat(ntmp, " - ", nlen);
-        BUF_strlcat(ntmp, vtmp->name, nlen);
+        OPENSSL_strlcpy(ntmp, objtmp, nlen);
+        OPENSSL_strlcat(ntmp, " - ", nlen);
+        OPENSSL_strlcat(ntmp, vtmp->name, nlen);
         OPENSSL_free(vtmp->name);
         vtmp->name = ntmp;
@@ -192,7 +191,7 @@ static AUTHORITY_INFO_ACCESS *v2i_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD
             OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
             goto err;
         }
-        BUF_strlcpy(objtmp, cnf->name, objlen + 1);
+        OPENSSL_strlcpy(objtmp, cnf->name, objlen + 1);
         acc->method = OBJ_txt2obj(objtmp, 0);
         if (!acc->method) {
             OPENSSL_PUT_ERROR(X509V3, X509V3_R_BAD_OBJECT);

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_int.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_lib.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_ncons.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_ocsp.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_pci.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_pcia.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_pcons.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_pku.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_pmaps.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_prn.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_purp.c RENAMED

@@ -59,7 +59,6 @@
 #include <string.h>
-#include <openssl/buf.h>
 #include <openssl/err.h>
 #include <openssl/digest.h>
 #include <openssl/mem.h>
@@ -237,8 +236,8 @@ int X509_PURPOSE_add(int id, int trust, int flags,
         ptmp = X509_PURPOSE_get0(idx);
     /* Duplicate the supplied names. */
-    name_dup = BUF_strdup(name);
-    sname_dup = BUF_strdup(sname);
+    name_dup = OPENSSL_strdup(name);
+    sname_dup = OPENSSL_strdup(sname);
     if (name_dup == NULL || sname_dup == NULL) {
         OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
         if (name_dup != NULL)

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_skey.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_sxnet.c RENAMED

File without changes

data/third_party/{boringssl → boringssl-with-bazel/src}/crypto/x509v3/v3_utl.c RENAMED

@@ -63,7 +63,6 @@
 #include <string.h>
 #include <openssl/bn.h>
-#include <openssl/buf.h>
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include <openssl/mem.h>
@@ -94,9 +93,9 @@ int X509V3_add_value(const char *name, const char *value,
 {
     CONF_VALUE *vtmp = NULL;
     char *tname = NULL, *tvalue = NULL;
-    if (name && !(tname = BUF_strdup(name)))
+    if (name && !(tname = OPENSSL_strdup(name)))
         goto err;
-    if (value && !(tvalue = BUF_strdup(value)))
+    if (value && !(tvalue = OPENSSL_strdup(value)))
         goto err;
     if (!(vtmp = CONF_VALUE_new()))
         goto err;
@@ -185,11 +184,11 @@ static char *bignum_to_string(const BIGNUM *bn)
     /* Prepend "0x", but place it after the "-" if negative. */
     if (tmp[0] == '-') {
-        BUF_strlcpy(ret, "-0x", len);
-        BUF_strlcat(ret, tmp + 1, len);
+        OPENSSL_strlcpy(ret, "-0x", len);
+        OPENSSL_strlcat(ret, tmp + 1, len);
     } else {
-        BUF_strlcpy(ret, "0x", len);
-        BUF_strlcat(ret, tmp, len);
+        OPENSSL_strlcpy(ret, "0x", len);
+        OPENSSL_strlcat(ret, tmp, len);
     }
     OPENSSL_free(tmp);
     return ret;
@@ -331,7 +330,7 @@ STACK_OF(CONF_VALUE) *X509V3_parse_list(const char *line)
     char *linebuf;
     int state;
     /* We are going to modify the line so copy it first */
-    linebuf = BUF_strdup(line);
+    linebuf = OPENSSL_strdup(line);
     if (linebuf == NULL) {
         OPENSSL_PUT_ERROR(X509V3, ERR_R_MALLOC_FAILURE);
         goto err;
@@ -646,7 +645,7 @@ static int append_ia5(STACK_OF(OPENSSL_STRING) **sk, ASN1_IA5STRING *email)
     sk_OPENSSL_STRING_sort(*sk);
     if (sk_OPENSSL_STRING_find(*sk, NULL, (char *)email->data))
         return 1;
-    emtmp = BUF_strdup((char *)email->data);
+    emtmp = OPENSSL_strdup((char *)email->data);
     if (!emtmp || !sk_OPENSSL_STRING_push(*sk, emtmp)) {
         X509_email_free(*sk);
         *sk = NULL;
@@ -978,7 +977,7 @@ static int do_check_string(ASN1_STRING *a, int cmp_type, equal_fn equal,
         else if (a->length == (int)blen && !OPENSSL_memcmp(a->data, b, blen))
             rv = 1;
         if (rv > 0 && peername)
-            *peername = BUF_strndup((char *)a->data, a->length);
+            *peername = OPENSSL_strndup((char *)a->data, a->length);
     } else {
         int astrlen;
         unsigned char *astr;
@@ -997,7 +996,7 @@ static int do_check_string(ASN1_STRING *a, int cmp_type, equal_fn equal,
             rv = equal(astr, astrlen, (unsigned char *)b, blen, flags);
         }
         if (rv > 0 && peername)
-            *peername = BUF_strndup((char *)astr, astrlen);
+            *peername = OPENSSL_strndup((char *)astr, astrlen);
         OPENSSL_free(astr);
     }
     return rv;
@@ -1156,7 +1155,7 @@ ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc)
     p = strchr(ipasc, '/');
     if (!p)
         return NULL;
-    iptmp = BUF_strdup(ipasc);
+    iptmp = OPENSSL_strdup(ipasc);
     if (!iptmp)
         return NULL;
     p = iptmp + (p - ipasc);