40 files changed, 108 insertions, 108 deletions

diff --git a/src/lib/libcrypto/asn1/a_bitstr.c b/src/lib/libcrypto/asn1/a_bitstr.c
index 5575a5c939..c0259ad815 100644
--- a/src/lib/libcrypto/asn1/a_bitstr.c
+++ b/src/lib/libcrypto/asn1/a_bitstr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_bitstr.c,v 1.21 2015/07/19 18:29:31 miod Exp $ */
+/* $OpenBSD: a_bitstr.c,v 1.22 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -65,7 +65,7 @@
 int
 ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
 {
-        return M_ASN1_BIT_STRING_set(x, d, len);
+        return ASN1_STRING_set(x, d, len);
 }
 
 int
diff --git a/src/lib/libcrypto/asn1/a_int.c b/src/lib/libcrypto/asn1/a_int.c
index 7d17aae2a2..6a378c0884 100644
--- a/src/lib/libcrypto/asn1/a_int.c
+++ b/src/lib/libcrypto/asn1/a_int.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_int.c,v 1.27 2015/07/19 18:29:31 miod Exp $ */
+/* $OpenBSD: a_int.c,v 1.28 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -66,7 +66,7 @@
 ASN1_INTEGER *
 ASN1_INTEGER_dup(const ASN1_INTEGER *x)
 {
-        return M_ASN1_INTEGER_dup(x);
+        return ASN1_STRING_dup(x);
 }
 
 int
diff --git a/src/lib/libcrypto/asn1/a_octet.c b/src/lib/libcrypto/asn1/a_octet.c
index 8c57592174..d998675d3f 100644
--- a/src/lib/libcrypto/asn1/a_octet.c
+++ b/src/lib/libcrypto/asn1/a_octet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_octet.c,v 1.9 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: a_octet.c,v 1.10 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -63,17 +63,17 @@
 ASN1_OCTET_STRING *
 ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *x)
 {
-        return M_ASN1_OCTET_STRING_dup(x);
+        return ASN1_STRING_dup(x);
 }
 
 int
 ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a, const ASN1_OCTET_STRING *b)
 {
-        return M_ASN1_OCTET_STRING_cmp(a, b);
+        return ASN1_STRING_cmp(a, b);
 }
 
 int
 ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *x, const unsigned char *d, int len)
 {
-        return M_ASN1_OCTET_STRING_set(x, d, len);
+        return ASN1_STRING_set(x, d, len);
 }
diff --git a/src/lib/libcrypto/asn1/evp_asn1.c b/src/lib/libcrypto/asn1/evp_asn1.c
index 5e21f3c8ae..5ee4751763 100644
--- a/src/lib/libcrypto/asn1/evp_asn1.c
+++ b/src/lib/libcrypto/asn1/evp_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_asn1.c,v 1.13 2014/07/12 16:03:36 miod Exp $ */
+/* $OpenBSD: evp_asn1.c,v 1.14 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -70,7 +70,7 @@ ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len)
 
         if ((os = M_ASN1_OCTET_STRING_new()) == NULL)
                 return (0);
-        if (!M_ASN1_OCTET_STRING_set(os, data, len)) {
+        if (!ASN1_STRING_set(os, data, len)) {
                 M_ASN1_OCTET_STRING_free(os);
                 return (0);
         }
diff --git a/src/lib/libcrypto/asn1/t_req.c b/src/lib/libcrypto/asn1/t_req.c
index 51f711acf7..8db456708a 100644
--- a/src/lib/libcrypto/asn1/t_req.c
+++ b/src/lib/libcrypto/asn1/t_req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t_req.c,v 1.17 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: t_req.c,v 1.18 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -239,7 +239,7 @@ get_next:
                                         goto err;
                                 if (!X509V3_EXT_print(bp, ex, cflag, 16)) {
                                         BIO_printf(bp, "%16s", "");
-                                        M_ASN1_OCTET_STRING_print(bp, ex->value);
+                                        ASN1_STRING_print(bp, ex->value);
                                 }
                                 if (BIO_write(bp, "\n", 1) <= 0)
                                         goto err;
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index 0ee949134e..2e7e1746fa 100644
--- a/src/lib/libcrypto/ec/ec_asn1.c
+++ b/src/lib/libcrypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.15 2015/07/25 14:36:39 jsing Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.16 2015/07/29 14:58:34 jsing Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -858,8 +858,8 @@ ec_asn1_group2curve(const EC_GROUP * group, X9_62_CURVE * curve)
         }
 
         /* set a and b */
-        if (!M_ASN1_OCTET_STRING_set(curve->a, a_buf, len_1) ||
-            !M_ASN1_OCTET_STRING_set(curve->b, b_buf, len_2)) {
+        if (!ASN1_STRING_set(curve->a, a_buf, len_1) ||
+            !ASN1_STRING_set(curve->b, b_buf, len_2)) {
                 ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_ASN1_LIB);
                 goto err;
         }
@@ -1447,7 +1447,7 @@ i2d_ECPrivateKey(EC_KEY * a, unsigned char **out)
                 ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_BN_LIB);
                 goto err;
         }
-        if (!M_ASN1_OCTET_STRING_set(priv_key->privateKey, buffer, buf_len)) {
+        if (!ASN1_STRING_set(priv_key->privateKey, buffer, buf_len)) {
                 ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_ASN1_LIB);
                 goto err;
         }
@@ -1484,7 +1484,7 @@ i2d_ECPrivateKey(EC_KEY * a, unsigned char **out)
                 }
                 priv_key->publicKey->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT | 0x07);
                 priv_key->publicKey->flags |= ASN1_STRING_FLAG_BITS_LEFT;
-                if (!M_ASN1_BIT_STRING_set(priv_key->publicKey, buffer,
+                if (!ASN1_STRING_set(priv_key->publicKey, buffer,
                         buf_len)) {
                         ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_ASN1_LIB);
                         goto err;
diff --git a/src/lib/libcrypto/pkcs12/p12_mutl.c b/src/lib/libcrypto/pkcs12/p12_mutl.c
index ac58f50ca7..00acf1f210 100644
--- a/src/lib/libcrypto/pkcs12/p12_mutl.c
+++ b/src/lib/libcrypto/pkcs12/p12_mutl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_mutl.c,v 1.19 2014/10/22 18:37:22 miod Exp $ */
+/* $OpenBSD: p12_mutl.c,v 1.20 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -160,7 +160,7 @@ PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen, unsigned char *salt,
                     PKCS12_R_MAC_GENERATION_ERROR);
                 return 0;
         }
-        if (!(M_ASN1_OCTET_STRING_set(p12->mac->dinfo->digest, mac, maclen))) {
+        if (!(ASN1_STRING_set(p12->mac->dinfo->digest, mac, maclen))) {
                 PKCS12err(PKCS12_F_PKCS12_SET_MAC,
                     PKCS12_R_MAC_STRING_SET_ERROR);
                 return 0;
diff --git a/src/lib/libcrypto/pkcs7/pk7_doit.c b/src/lib/libcrypto/pkcs7/pk7_doit.c
index 2c69edf499..24bcebef61 100644
--- a/src/lib/libcrypto/pkcs7/pk7_doit.c
+++ b/src/lib/libcrypto/pkcs7/pk7_doit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk7_doit.c,v 1.35 2015/07/19 18:25:59 miod Exp $ */
+/* $OpenBSD: pk7_doit.c,v 1.36 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -417,7 +417,7 @@ pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert)
             pcert->cert_info->issuer);
         if (ret)
                 return ret;
-        return M_ASN1_INTEGER_cmp(pcert->cert_info->serialNumber,
+        return ASN1_STRING_cmp(pcert->cert_info->serialNumber,
             ri->issuer_and_serial->serial);
 }
 
@@ -856,7 +856,7 @@ PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
                         goto err;
                 if (!EVP_DigestFinal_ex(mdc, md_data, &md_len))
                         goto err;
-                if (M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data,
+                if (ASN1_STRING_set(p7->d.digest->digest, md_data,
                     md_len) == 0)
                         goto err;
         }
diff --git a/src/lib/libcrypto/pkcs7/pk7_lib.c b/src/lib/libcrypto/pkcs7/pk7_lib.c
index 3eec92e29b..9f7e4f2dd3 100644
--- a/src/lib/libcrypto/pkcs7/pk7_lib.c
+++ b/src/lib/libcrypto/pkcs7/pk7_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk7_lib.c,v 1.15 2015/03/19 14:00:22 tedu Exp $ */
+/* $OpenBSD: pk7_lib.c,v 1.16 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -380,7 +380,7 @@ PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
          * things the ugly way. */
         M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
         if (!(p7i->issuer_and_serial->serial =
-            M_ASN1_INTEGER_dup(X509_get_serialNumber(x509))))
+            ASN1_STRING_dup(X509_get_serialNumber(x509))))
                 goto err;
 
         /* lets keep the pkey around for a while */
@@ -545,7 +545,7 @@ PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
 
         M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
         if (!(p7i->issuer_and_serial->serial =
-            M_ASN1_INTEGER_dup(X509_get_serialNumber(x509))))
+            ASN1_STRING_dup(X509_get_serialNumber(x509))))
                 return 0;
 
         pkey = X509_get_pubkey(x509);
diff --git a/src/lib/libcrypto/ts/ts_lib.c b/src/lib/libcrypto/ts/ts_lib.c
index f08bb8701d..ac5f65df94 100644
--- a/src/lib/libcrypto/ts/ts_lib.c
+++ b/src/lib/libcrypto/ts/ts_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_lib.c,v 1.8 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: ts_lib.c,v 1.9 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -117,7 +117,7 @@ TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions)
                 BIO_printf(bio, ": %s\n", critical ? "critical" : "");
                 if (!X509V3_EXT_print(bio, ex, 0, 4)) {
                         BIO_printf(bio, "%4s", "");
-                        M_ASN1_OCTET_STRING_print(bio, ex->value);
+                        ASN1_STRING_print(bio, ex->value);
                 }
                 BIO_write(bio, "\n", 1);
         }
diff --git a/src/lib/libcrypto/ts/ts_rsp_utils.c b/src/lib/libcrypto/ts/ts_rsp_utils.c
index 0d05814297..39eb2a2963 100644
--- a/src/lib/libcrypto/ts/ts_rsp_utils.c
+++ b/src/lib/libcrypto/ts/ts_rsp_utils.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_rsp_utils.c,v 1.4 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: ts_rsp_utils.c,v 1.5 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -200,7 +200,7 @@ TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime)
 
         if (a->time == gtime)
                 return 1;
-        new_time = M_ASN1_GENERALIZEDTIME_dup(gtime);
+        new_time = ASN1_STRING_dup(gtime);
         if (new_time == NULL) {
                 TSerr(TS_F_TS_TST_INFO_SET_TIME, ERR_R_MALLOC_FAILURE);
                 return 0;
diff --git a/src/lib/libcrypto/x509/x509_cmp.c b/src/lib/libcrypto/x509/x509_cmp.c
index 030e29bde7..407e1e07ad 100644
--- a/src/lib/libcrypto/x509/x509_cmp.c
+++ b/src/lib/libcrypto/x509/x509_cmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_cmp.c,v 1.25 2014/09/26 19:31:09 miod Exp $ */
+/* $OpenBSD: x509_cmp.c,v 1.26 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -76,7 +76,7 @@ X509_issuer_and_serial_cmp(const X509 *a, const X509 *b)
 
         ai = a->cert_info;
         bi = b->cert_info;
-        i = M_ASN1_INTEGER_cmp(ai->serialNumber, bi->serialNumber);
+        i = ASN1_STRING_cmp(ai->serialNumber, bi->serialNumber);
         if (i)
                 return (i);
         return (X509_NAME_cmp(ai->issuer, bi->issuer));
diff --git a/src/lib/libcrypto/x509/x509_set.c b/src/lib/libcrypto/x509/x509_set.c
index 3be557cbc0..c6160b90b0 100644
--- a/src/lib/libcrypto/x509/x509_set.c
+++ b/src/lib/libcrypto/x509/x509_set.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_set.c,v 1.9 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: x509_set.c,v 1.10 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -84,7 +84,7 @@ X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial)
                 return (0);
         in = x->cert_info->serialNumber;
         if (in != serial) {
-                in = M_ASN1_INTEGER_dup(serial);
+                in = ASN1_STRING_dup(serial);
                 if (in != NULL) {
                         M_ASN1_INTEGER_free(x->cert_info->serialNumber);
                         x->cert_info->serialNumber = in;
@@ -118,7 +118,7 @@ X509_set_notBefore(X509 *x, const ASN1_TIME *tm)
                 return (0);
         in = x->cert_info->validity->notBefore;
         if (in != tm) {
-                in = M_ASN1_TIME_dup(tm);
+                in = ASN1_STRING_dup(tm);
                 if (in != NULL) {
                         M_ASN1_TIME_free(x->cert_info->validity->notBefore);
                         x->cert_info->validity->notBefore = in;
@@ -136,7 +136,7 @@ X509_set_notAfter(X509 *x, const ASN1_TIME *tm)
                 return (0);
         in = x->cert_info->validity->notAfter;
         if (in != tm) {
-                in = M_ASN1_TIME_dup(tm);
+                in = ASN1_STRING_dup(tm);
                 if (in != NULL) {
                         M_ASN1_TIME_free(x->cert_info->validity->notAfter);
                         x->cert_info->validity->notAfter = in;
diff --git a/src/lib/libcrypto/x509/x509_v3.c b/src/lib/libcrypto/x509/x509_v3.c
index 3d3a96f59b..a9f3fdb10e 100644
--- a/src/lib/libcrypto/x509/x509_v3.c
+++ b/src/lib/libcrypto/x509/x509_v3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_v3.c,v 1.11 2014/09/28 10:53:57 miod Exp $ */
+/* $OpenBSD: x509_v3.c,v 1.12 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -267,7 +267,7 @@ X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data)
 
         if (ex == NULL)
                 return (0);
-        i = M_ASN1_OCTET_STRING_set(ex->value, data->data, data->length);
+        i = ASN1_STRING_set(ex->value, data->data, data->length);
         if (!i)
                 return (0);
         return (1);
diff --git a/src/lib/libcrypto/x509/x509cset.c b/src/lib/libcrypto/x509/x509cset.c
index a4442632f6..94c419301a 100644
--- a/src/lib/libcrypto/x509/x509cset.c
+++ b/src/lib/libcrypto/x509/x509cset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509cset.c,v 1.8 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: x509cset.c,v 1.9 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -92,7 +92,7 @@ X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm)
                 return (0);
         in = x->crl->lastUpdate;
         if (in != tm) {
-                in = M_ASN1_TIME_dup(tm);
+                in = ASN1_STRING_dup(tm);
                 if (in != NULL) {
                         M_ASN1_TIME_free(x->crl->lastUpdate);
                         x->crl->lastUpdate = in;
@@ -110,7 +110,7 @@ X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm)
                 return (0);
         in = x->crl->nextUpdate;
         if (in != tm) {
-                in = M_ASN1_TIME_dup(tm);
+                in = ASN1_STRING_dup(tm);
                 if (in != NULL) {
                         M_ASN1_TIME_free(x->crl->nextUpdate);
                         x->crl->nextUpdate = in;
@@ -145,7 +145,7 @@ X509_REVOKED_set_revocationDate(X509_REVOKED *x, ASN1_TIME *tm)
                 return (0);
         in = x->revocationDate;
         if (in != tm) {
-                in = M_ASN1_TIME_dup(tm);
+                in = ASN1_STRING_dup(tm);
                 if (in != NULL) {
                         M_ASN1_TIME_free(x->revocationDate);
                         x->revocationDate = in;
@@ -163,7 +163,7 @@ X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial)
                 return (0);
         in = x->serialNumber;
         if (in != serial) {
-                in = M_ASN1_INTEGER_dup(serial);
+                in = ASN1_STRING_dup(serial);
                 if (in != NULL) {
                         M_ASN1_INTEGER_free(x->serialNumber);
                         x->serialNumber = in;
diff --git a/src/lib/libcrypto/x509v3/v3_akey.c b/src/lib/libcrypto/x509v3/v3_akey.c
index d5b5f685af..2bf515cfdd 100644
--- a/src/lib/libcrypto/x509v3/v3_akey.c
+++ b/src/lib/libcrypto/x509v3/v3_akey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_akey.c,v 1.13 2014/10/05 18:26:22 miod Exp $ */
+/* $OpenBSD: v3_akey.c,v 1.14 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -169,7 +169,7 @@ v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
 
         if ((issuer && !ikeyid) || (issuer == 2)) {
                 isname = X509_NAME_dup(X509_get_issuer_name(cert));
-                serial = M_ASN1_INTEGER_dup(X509_get_serialNumber(cert));
+                serial = ASN1_STRING_dup(X509_get_serialNumber(cert));
                 if (!isname || !serial) {
                         X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,
                             X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS);
diff --git a/src/lib/libcrypto/x509v3/v3_alt.c b/src/lib/libcrypto/x509v3/v3_alt.c
index 2592288bdb..5b0dae2af6 100644
--- a/src/lib/libcrypto/x509v3/v3_alt.c
+++ b/src/lib/libcrypto/x509v3/v3_alt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_alt.c,v 1.22 2014/10/28 05:46:56 miod Exp $ */
+/* $OpenBSD: v3_alt.c,v 1.23 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -390,7 +390,7 @@ copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
         while ((i = X509_NAME_get_index_by_NID(nm,
             NID_pkcs9_emailAddress, i)) >= 0) {
                 ne = X509_NAME_get_entry(nm, i);
-                email = M_ASN1_IA5STRING_dup(X509_NAME_ENTRY_get_data(ne));
+                email = ASN1_STRING_dup(X509_NAME_ENTRY_get_data(ne));
                 if (move_p) {
                         X509_NAME_delete_entry(nm, i);
                         X509_NAME_ENTRY_free(ne);
diff --git a/src/lib/libcrypto/x509v3/v3_prn.c b/src/lib/libcrypto/x509v3/v3_prn.c
index 037d129c87..e2d8dd8c87 100644
--- a/src/lib/libcrypto/x509v3/v3_prn.c
+++ b/src/lib/libcrypto/x509v3/v3_prn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_prn.c,v 1.17 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: v3_prn.c,v 1.18 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -178,7 +178,7 @@ X509V3_extensions_print(BIO *bp, char *title, STACK_OF(X509_EXTENSION) *exts,
                         return 0;
                 if (!X509V3_EXT_print(bp, ex, flag, indent + 4)) {
                         BIO_printf(bp, "%*s", indent + 4, "");
-                        M_ASN1_OCTET_STRING_print(bp, ex->value);
+                        ASN1_STRING_print(bp, ex->value);
                 }
                 if (BIO_write(bp, "\n",1) <= 0)
                         return 0;
diff --git a/src/lib/libcrypto/x509v3/v3_skey.c b/src/lib/libcrypto/x509v3/v3_skey.c
index ab2521f21a..1bcf8dacfb 100644
--- a/src/lib/libcrypto/x509v3/v3_skey.c
+++ b/src/lib/libcrypto/x509v3/v3_skey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_skey.c,v 1.10 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: v3_skey.c,v 1.11 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -138,7 +138,7 @@ s2i_skey_id(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str)
             EVP_sha1(), NULL))
                 goto err;
 
-        if (!M_ASN1_OCTET_STRING_set(oct, pkey_dig, diglen)) {
+        if (!ASN1_STRING_set(oct, pkey_dig, diglen)) {
                 X509V3err(X509V3_F_S2I_SKEY_ID, ERR_R_MALLOC_FAILURE);
                 goto err;
         }
diff --git a/src/lib/libcrypto/x509v3/v3_sxnet.c b/src/lib/libcrypto/x509v3/v3_sxnet.c
index d87dd34339..546b790782 100644
--- a/src/lib/libcrypto/x509v3/v3_sxnet.c
+++ b/src/lib/libcrypto/x509v3/v3_sxnet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_sxnet.c,v 1.14 2015/07/25 16:00:14 jsing Exp $ */
+/* $OpenBSD: v3_sxnet.c,v 1.15 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -211,7 +211,7 @@ sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out, int indent)
                 tmp = i2s_ASN1_INTEGER(NULL, id->zone);
                 BIO_printf(out, "\n%*sZone: %s, User: ", indent, "", tmp);
                 free(tmp);
-                M_ASN1_OCTET_STRING_print(out, id->user);
+                ASN1_STRING_print(out, id->user);
         }
         return 1;
 }
@@ -316,7 +316,7 @@ SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, char *user, int userlen)
         if (userlen == -1)
                 userlen = strlen(user);
 
-        if (!M_ASN1_OCTET_STRING_set(id->user, user, userlen))
+        if (!ASN1_STRING_set(id->user, user, userlen))
                 goto err;
         if (!sk_SXNETID_push(sx->ids, id))
                 goto err;
@@ -372,7 +372,7 @@ SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone)
 
         for (i = 0; i < sk_SXNETID_num(sx->ids); i++) {
                 id = sk_SXNETID_value(sx->ids, i);
-                if (!M_ASN1_INTEGER_cmp(id->zone, zone))
+                if (!ASN1_STRING_cmp(id->zone, zone))
                         return id->user;
         }
         return NULL;
diff --git a/src/lib/libssl/src/crypto/asn1/a_bitstr.c b/src/lib/libssl/src/crypto/asn1/a_bitstr.c
index 5575a5c939..c0259ad815 100644
--- a/src/lib/libssl/src/crypto/asn1/a_bitstr.c
+++ b/src/lib/libssl/src/crypto/asn1/a_bitstr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_bitstr.c,v 1.21 2015/07/19 18:29:31 miod Exp $ */
+/* $OpenBSD: a_bitstr.c,v 1.22 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -65,7 +65,7 @@
 int
 ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
 {
-        return M_ASN1_BIT_STRING_set(x, d, len);
+        return ASN1_STRING_set(x, d, len);
 }
 
 int
diff --git a/src/lib/libssl/src/crypto/asn1/a_int.c b/src/lib/libssl/src/crypto/asn1/a_int.c
index 7d17aae2a2..6a378c0884 100644
--- a/src/lib/libssl/src/crypto/asn1/a_int.c
+++ b/src/lib/libssl/src/crypto/asn1/a_int.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_int.c,v 1.27 2015/07/19 18:29:31 miod Exp $ */
+/* $OpenBSD: a_int.c,v 1.28 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -66,7 +66,7 @@
 ASN1_INTEGER *
 ASN1_INTEGER_dup(const ASN1_INTEGER *x)
 {
-        return M_ASN1_INTEGER_dup(x);
+        return ASN1_STRING_dup(x);
 }
 
 int
diff --git a/src/lib/libssl/src/crypto/asn1/a_octet.c b/src/lib/libssl/src/crypto/asn1/a_octet.c
index 8c57592174..d998675d3f 100644
--- a/src/lib/libssl/src/crypto/asn1/a_octet.c
+++ b/src/lib/libssl/src/crypto/asn1/a_octet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_octet.c,v 1.9 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: a_octet.c,v 1.10 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -63,17 +63,17 @@
 ASN1_OCTET_STRING *
 ASN1_OCTET_STRING_dup(const ASN1_OCTET_STRING *x)
 {
-        return M_ASN1_OCTET_STRING_dup(x);
+        return ASN1_STRING_dup(x);
 }
 
 int
 ASN1_OCTET_STRING_cmp(const ASN1_OCTET_STRING *a, const ASN1_OCTET_STRING *b)
 {
-        return M_ASN1_OCTET_STRING_cmp(a, b);
+        return ASN1_STRING_cmp(a, b);
 }
 
 int
 ASN1_OCTET_STRING_set(ASN1_OCTET_STRING *x, const unsigned char *d, int len)
 {
-        return M_ASN1_OCTET_STRING_set(x, d, len);
+        return ASN1_STRING_set(x, d, len);
 }
diff --git a/src/lib/libssl/src/crypto/asn1/evp_asn1.c b/src/lib/libssl/src/crypto/asn1/evp_asn1.c
index 5e21f3c8ae..5ee4751763 100644
--- a/src/lib/libssl/src/crypto/asn1/evp_asn1.c
+++ b/src/lib/libssl/src/crypto/asn1/evp_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_asn1.c,v 1.13 2014/07/12 16:03:36 miod Exp $ */
+/* $OpenBSD: evp_asn1.c,v 1.14 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -70,7 +70,7 @@ ASN1_TYPE_set_octetstring(ASN1_TYPE *a, unsigned char *data, int len)
 
         if ((os = M_ASN1_OCTET_STRING_new()) == NULL)
                 return (0);
-        if (!M_ASN1_OCTET_STRING_set(os, data, len)) {
+        if (!ASN1_STRING_set(os, data, len)) {
                 M_ASN1_OCTET_STRING_free(os);
                 return (0);
         }
diff --git a/src/lib/libssl/src/crypto/asn1/t_req.c b/src/lib/libssl/src/crypto/asn1/t_req.c
index 51f711acf7..8db456708a 100644
--- a/src/lib/libssl/src/crypto/asn1/t_req.c
+++ b/src/lib/libssl/src/crypto/asn1/t_req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t_req.c,v 1.17 2014/07/11 08:44:47 jsing Exp $ */
+/* $OpenBSD: t_req.c,v 1.18 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -239,7 +239,7 @@ get_next:
                                         goto err;
                                 if (!X509V3_EXT_print(bp, ex, cflag, 16)) {
                                         BIO_printf(bp, "%16s", "");
-                                        M_ASN1_OCTET_STRING_print(bp, ex->value);
+                                        ASN1_STRING_print(bp, ex->value);
                                 }
                                 if (BIO_write(bp, "\n", 1) <= 0)
                                         goto err;
diff --git a/src/lib/libssl/src/crypto/ec/ec_asn1.c b/src/lib/libssl/src/crypto/ec/ec_asn1.c
index 0ee949134e..2e7e1746fa 100644
--- a/src/lib/libssl/src/crypto/ec/ec_asn1.c
+++ b/src/lib/libssl/src/crypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.15 2015/07/25 14:36:39 jsing Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.16 2015/07/29 14:58:34 jsing Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project.
  */
@@ -858,8 +858,8 @@ ec_asn1_group2curve(const EC_GROUP * group, X9_62_CURVE * curve)
         }
 
         /* set a and b */
-        if (!M_ASN1_OCTET_STRING_set(curve->a, a_buf, len_1) ||
-            !M_ASN1_OCTET_STRING_set(curve->b, b_buf, len_2)) {
+        if (!ASN1_STRING_set(curve->a, a_buf, len_1) ||
+            !ASN1_STRING_set(curve->b, b_buf, len_2)) {
                 ECerr(EC_F_EC_ASN1_GROUP2CURVE, ERR_R_ASN1_LIB);
                 goto err;
         }
@@ -1447,7 +1447,7 @@ i2d_ECPrivateKey(EC_KEY * a, unsigned char **out)
                 ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_BN_LIB);
                 goto err;
         }
-        if (!M_ASN1_OCTET_STRING_set(priv_key->privateKey, buffer, buf_len)) {
+        if (!ASN1_STRING_set(priv_key->privateKey, buffer, buf_len)) {
                 ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_ASN1_LIB);
                 goto err;
         }
@@ -1484,7 +1484,7 @@ i2d_ECPrivateKey(EC_KEY * a, unsigned char **out)
                 }
                 priv_key->publicKey->flags &= ~(ASN1_STRING_FLAG_BITS_LEFT | 0x07);
                 priv_key->publicKey->flags |= ASN1_STRING_FLAG_BITS_LEFT;
-                if (!M_ASN1_BIT_STRING_set(priv_key->publicKey, buffer,
+                if (!ASN1_STRING_set(priv_key->publicKey, buffer,
                         buf_len)) {
                         ECerr(EC_F_I2D_ECPRIVATEKEY, ERR_R_ASN1_LIB);
                         goto err;
diff --git a/src/lib/libssl/src/crypto/pkcs12/p12_mutl.c b/src/lib/libssl/src/crypto/pkcs12/p12_mutl.c
index ac58f50ca7..00acf1f210 100644
--- a/src/lib/libssl/src/crypto/pkcs12/p12_mutl.c
+++ b/src/lib/libssl/src/crypto/pkcs12/p12_mutl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p12_mutl.c,v 1.19 2014/10/22 18:37:22 miod Exp $ */
+/* $OpenBSD: p12_mutl.c,v 1.20 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -160,7 +160,7 @@ PKCS12_set_mac(PKCS12 *p12, const char *pass, int passlen, unsigned char *salt,
                     PKCS12_R_MAC_GENERATION_ERROR);
                 return 0;
         }
-        if (!(M_ASN1_OCTET_STRING_set(p12->mac->dinfo->digest, mac, maclen))) {
+        if (!(ASN1_STRING_set(p12->mac->dinfo->digest, mac, maclen))) {
                 PKCS12err(PKCS12_F_PKCS12_SET_MAC,
                     PKCS12_R_MAC_STRING_SET_ERROR);
                 return 0;
diff --git a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c
index 2c69edf499..24bcebef61 100644
--- a/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c
+++ b/src/lib/libssl/src/crypto/pkcs7/pk7_doit.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk7_doit.c,v 1.35 2015/07/19 18:25:59 miod Exp $ */
+/* $OpenBSD: pk7_doit.c,v 1.36 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -417,7 +417,7 @@ pkcs7_cmp_ri(PKCS7_RECIP_INFO *ri, X509 *pcert)
             pcert->cert_info->issuer);
         if (ret)
                 return ret;
-        return M_ASN1_INTEGER_cmp(pcert->cert_info->serialNumber,
+        return ASN1_STRING_cmp(pcert->cert_info->serialNumber,
             ri->issuer_and_serial->serial);
 }
 
@@ -856,7 +856,7 @@ PKCS7_dataFinal(PKCS7 *p7, BIO *bio)
                         goto err;
                 if (!EVP_DigestFinal_ex(mdc, md_data, &md_len))
                         goto err;
-                if (M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data,
+                if (ASN1_STRING_set(p7->d.digest->digest, md_data,
                     md_len) == 0)
                         goto err;
         }
diff --git a/src/lib/libssl/src/crypto/pkcs7/pk7_lib.c b/src/lib/libssl/src/crypto/pkcs7/pk7_lib.c
index 3eec92e29b..9f7e4f2dd3 100644
--- a/src/lib/libssl/src/crypto/pkcs7/pk7_lib.c
+++ b/src/lib/libssl/src/crypto/pkcs7/pk7_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk7_lib.c,v 1.15 2015/03/19 14:00:22 tedu Exp $ */
+/* $OpenBSD: pk7_lib.c,v 1.16 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -380,7 +380,7 @@ PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
          * things the ugly way. */
         M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
         if (!(p7i->issuer_and_serial->serial =
-            M_ASN1_INTEGER_dup(X509_get_serialNumber(x509))))
+            ASN1_STRING_dup(X509_get_serialNumber(x509))))
                 goto err;
 
         /* lets keep the pkey around for a while */
@@ -545,7 +545,7 @@ PKCS7_RECIP_INFO_set(PKCS7_RECIP_INFO *p7i, X509 *x509)
 
         M_ASN1_INTEGER_free(p7i->issuer_and_serial->serial);
         if (!(p7i->issuer_and_serial->serial =
-            M_ASN1_INTEGER_dup(X509_get_serialNumber(x509))))
+            ASN1_STRING_dup(X509_get_serialNumber(x509))))
                 return 0;
 
         pkey = X509_get_pubkey(x509);
diff --git a/src/lib/libssl/src/crypto/ts/ts_lib.c b/src/lib/libssl/src/crypto/ts/ts_lib.c
index f08bb8701d..ac5f65df94 100644
--- a/src/lib/libssl/src/crypto/ts/ts_lib.c
+++ b/src/lib/libssl/src/crypto/ts/ts_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_lib.c,v 1.8 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: ts_lib.c,v 1.9 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -117,7 +117,7 @@ TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions)
                 BIO_printf(bio, ": %s\n", critical ? "critical" : "");
                 if (!X509V3_EXT_print(bio, ex, 0, 4)) {
                         BIO_printf(bio, "%4s", "");
-                        M_ASN1_OCTET_STRING_print(bio, ex->value);
+                        ASN1_STRING_print(bio, ex->value);
                 }
                 BIO_write(bio, "\n", 1);
         }
diff --git a/src/lib/libssl/src/crypto/ts/ts_rsp_utils.c b/src/lib/libssl/src/crypto/ts/ts_rsp_utils.c
index 0d05814297..39eb2a2963 100644
--- a/src/lib/libssl/src/crypto/ts/ts_rsp_utils.c
+++ b/src/lib/libssl/src/crypto/ts/ts_rsp_utils.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_rsp_utils.c,v 1.4 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: ts_rsp_utils.c,v 1.5 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
  * project 2002.
  */
@@ -200,7 +200,7 @@ TS_TST_INFO_set_time(TS_TST_INFO *a, const ASN1_GENERALIZEDTIME *gtime)
 
         if (a->time == gtime)
                 return 1;
-        new_time = M_ASN1_GENERALIZEDTIME_dup(gtime);
+        new_time = ASN1_STRING_dup(gtime);
         if (new_time == NULL) {
                 TSerr(TS_F_TS_TST_INFO_SET_TIME, ERR_R_MALLOC_FAILURE);
                 return 0;
diff --git a/src/lib/libssl/src/crypto/x509/x509_cmp.c b/src/lib/libssl/src/crypto/x509/x509_cmp.c
index 030e29bde7..407e1e07ad 100644
--- a/src/lib/libssl/src/crypto/x509/x509_cmp.c
+++ b/src/lib/libssl/src/crypto/x509/x509_cmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_cmp.c,v 1.25 2014/09/26 19:31:09 miod Exp $ */
+/* $OpenBSD: x509_cmp.c,v 1.26 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -76,7 +76,7 @@ X509_issuer_and_serial_cmp(const X509 *a, const X509 *b)
 
         ai = a->cert_info;
         bi = b->cert_info;
-        i = M_ASN1_INTEGER_cmp(ai->serialNumber, bi->serialNumber);
+        i = ASN1_STRING_cmp(ai->serialNumber, bi->serialNumber);
         if (i)
                 return (i);
         return (X509_NAME_cmp(ai->issuer, bi->issuer));
diff --git a/src/lib/libssl/src/crypto/x509/x509_set.c b/src/lib/libssl/src/crypto/x509/x509_set.c
index 3be557cbc0..c6160b90b0 100644
--- a/src/lib/libssl/src/crypto/x509/x509_set.c
+++ b/src/lib/libssl/src/crypto/x509/x509_set.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_set.c,v 1.9 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: x509_set.c,v 1.10 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -84,7 +84,7 @@ X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial)
                 return (0);
         in = x->cert_info->serialNumber;
         if (in != serial) {
-                in = M_ASN1_INTEGER_dup(serial);
+                in = ASN1_STRING_dup(serial);
                 if (in != NULL) {
                         M_ASN1_INTEGER_free(x->cert_info->serialNumber);
                         x->cert_info->serialNumber = in;
@@ -118,7 +118,7 @@ X509_set_notBefore(X509 *x, const ASN1_TIME *tm)
                 return (0);
         in = x->cert_info->validity->notBefore;
         if (in != tm) {
-                in = M_ASN1_TIME_dup(tm);
+                in = ASN1_STRING_dup(tm);
                 if (in != NULL) {
                         M_ASN1_TIME_free(x->cert_info->validity->notBefore);
                         x->cert_info->validity->notBefore = in;
@@ -136,7 +136,7 @@ X509_set_notAfter(X509 *x, const ASN1_TIME *tm)
                 return (0);
         in = x->cert_info->validity->notAfter;
         if (in != tm) {
-                in = M_ASN1_TIME_dup(tm);
+                in = ASN1_STRING_dup(tm);
                 if (in != NULL) {
                         M_ASN1_TIME_free(x->cert_info->validity->notAfter);
                         x->cert_info->validity->notAfter = in;
diff --git a/src/lib/libssl/src/crypto/x509/x509_v3.c b/src/lib/libssl/src/crypto/x509/x509_v3.c
index 3d3a96f59b..a9f3fdb10e 100644
--- a/src/lib/libssl/src/crypto/x509/x509_v3.c
+++ b/src/lib/libssl/src/crypto/x509/x509_v3.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_v3.c,v 1.11 2014/09/28 10:53:57 miod Exp $ */
+/* $OpenBSD: x509_v3.c,v 1.12 2015/07/29 14:58:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -267,7 +267,7 @@ X509_EXTENSION_set_data(X509_EXTENSION *ex, ASN1_OCTET_STRING *data)
 
         if (ex == NULL)
                 return (0);
-        i = M_ASN1_OCTET_STRING_set(ex->value, data->data, data->length);
+        i = ASN1_STRING_set(ex->value, data->data, data->length);
         if (!i)
                 return (0);
         return (1);
diff --git a/src/lib/libssl/src/crypto/x509/x509cset.c b/src/lib/libssl/src/crypto/x509/x509cset.c
index a4442632f6..94c419301a 100644
--- a/src/lib/libssl/src/crypto/x509/x509cset.c
+++ b/src/lib/libssl/src/crypto/x509/x509cset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509cset.c,v 1.8 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: x509cset.c,v 1.9 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -92,7 +92,7 @@ X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm)
                 return (0);
         in = x->crl->lastUpdate;
         if (in != tm) {
-                in = M_ASN1_TIME_dup(tm);
+                in = ASN1_STRING_dup(tm);
                 if (in != NULL) {
                         M_ASN1_TIME_free(x->crl->lastUpdate);
                         x->crl->lastUpdate = in;
@@ -110,7 +110,7 @@ X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm)
                 return (0);
         in = x->crl->nextUpdate;
         if (in != tm) {
-                in = M_ASN1_TIME_dup(tm);
+                in = ASN1_STRING_dup(tm);
                 if (in != NULL) {
                         M_ASN1_TIME_free(x->crl->nextUpdate);
                         x->crl->nextUpdate = in;
@@ -145,7 +145,7 @@ X509_REVOKED_set_revocationDate(X509_REVOKED *x, ASN1_TIME *tm)
                 return (0);
         in = x->revocationDate;
         if (in != tm) {
-                in = M_ASN1_TIME_dup(tm);
+                in = ASN1_STRING_dup(tm);
                 if (in != NULL) {
                         M_ASN1_TIME_free(x->revocationDate);
                         x->revocationDate = in;
@@ -163,7 +163,7 @@ X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial)
                 return (0);
         in = x->serialNumber;
         if (in != serial) {
-                in = M_ASN1_INTEGER_dup(serial);
+                in = ASN1_STRING_dup(serial);
                 if (in != NULL) {
                         M_ASN1_INTEGER_free(x->serialNumber);
                         x->serialNumber = in;
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_akey.c b/src/lib/libssl/src/crypto/x509v3/v3_akey.c
index d5b5f685af..2bf515cfdd 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_akey.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_akey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_akey.c,v 1.13 2014/10/05 18:26:22 miod Exp $ */
+/* $OpenBSD: v3_akey.c,v 1.14 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -169,7 +169,7 @@ v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx,
 
         if ((issuer && !ikeyid) || (issuer == 2)) {
                 isname = X509_NAME_dup(X509_get_issuer_name(cert));
-                serial = M_ASN1_INTEGER_dup(X509_get_serialNumber(cert));
+                serial = ASN1_STRING_dup(X509_get_serialNumber(cert));
                 if (!isname || !serial) {
                         X509V3err(X509V3_F_V2I_AUTHORITY_KEYID,
                             X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS);
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_alt.c b/src/lib/libssl/src/crypto/x509v3/v3_alt.c
index 2592288bdb..5b0dae2af6 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_alt.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_alt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_alt.c,v 1.22 2014/10/28 05:46:56 miod Exp $ */
+/* $OpenBSD: v3_alt.c,v 1.23 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -390,7 +390,7 @@ copy_email(X509V3_CTX *ctx, GENERAL_NAMES *gens, int move_p)
         while ((i = X509_NAME_get_index_by_NID(nm,
             NID_pkcs9_emailAddress, i)) >= 0) {
                 ne = X509_NAME_get_entry(nm, i);
-                email = M_ASN1_IA5STRING_dup(X509_NAME_ENTRY_get_data(ne));
+                email = ASN1_STRING_dup(X509_NAME_ENTRY_get_data(ne));
                 if (move_p) {
                         X509_NAME_delete_entry(nm, i);
                         X509_NAME_ENTRY_free(ne);
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_prn.c b/src/lib/libssl/src/crypto/x509v3/v3_prn.c
index 037d129c87..e2d8dd8c87 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_prn.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_prn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_prn.c,v 1.17 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: v3_prn.c,v 1.18 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -178,7 +178,7 @@ X509V3_extensions_print(BIO *bp, char *title, STACK_OF(X509_EXTENSION) *exts,
                         return 0;
                 if (!X509V3_EXT_print(bp, ex, flag, indent + 4)) {
                         BIO_printf(bp, "%*s", indent + 4, "");
-                        M_ASN1_OCTET_STRING_print(bp, ex->value);
+                        ASN1_STRING_print(bp, ex->value);
                 }
                 if (BIO_write(bp, "\n",1) <= 0)
                         return 0;
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_skey.c b/src/lib/libssl/src/crypto/x509v3/v3_skey.c
index ab2521f21a..1bcf8dacfb 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_skey.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_skey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_skey.c,v 1.10 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: v3_skey.c,v 1.11 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -138,7 +138,7 @@ s2i_skey_id(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str)
             EVP_sha1(), NULL))
                 goto err;
 
-        if (!M_ASN1_OCTET_STRING_set(oct, pkey_dig, diglen)) {
+        if (!ASN1_STRING_set(oct, pkey_dig, diglen)) {
                 X509V3err(X509V3_F_S2I_SKEY_ID, ERR_R_MALLOC_FAILURE);
                 goto err;
         }
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_sxnet.c b/src/lib/libssl/src/crypto/x509v3/v3_sxnet.c
index d87dd34339..546b790782 100644
--- a/src/lib/libssl/src/crypto/x509v3/v3_sxnet.c
+++ b/src/lib/libssl/src/crypto/x509v3/v3_sxnet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: v3_sxnet.c,v 1.14 2015/07/25 16:00:14 jsing Exp $ */
+/* $OpenBSD: v3_sxnet.c,v 1.15 2015/07/29 14:58:34 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -211,7 +211,7 @@ sxnet_i2r(X509V3_EXT_METHOD *method, SXNET *sx, BIO *out, int indent)
                 tmp = i2s_ASN1_INTEGER(NULL, id->zone);
                 BIO_printf(out, "\n%*sZone: %s, User: ", indent, "", tmp);
                 free(tmp);
-                M_ASN1_OCTET_STRING_print(out, id->user);
+                ASN1_STRING_print(out, id->user);
         }
         return 1;
 }
@@ -316,7 +316,7 @@ SXNET_add_id_INTEGER(SXNET **psx, ASN1_INTEGER *zone, char *user, int userlen)
         if (userlen == -1)
                 userlen = strlen(user);
 
-        if (!M_ASN1_OCTET_STRING_set(id->user, user, userlen))
+        if (!ASN1_STRING_set(id->user, user, userlen))
                 goto err;
         if (!sk_SXNETID_push(sx->ids, id))
                 goto err;
@@ -372,7 +372,7 @@ SXNET_get_id_INTEGER(SXNET *sx, ASN1_INTEGER *zone)
 
         for (i = 0; i < sk_SXNETID_num(sx->ids); i++) {
                 id = sk_SXNETID_value(sx->ids, i);
-                if (!M_ASN1_INTEGER_cmp(id->zone, zone))
+                if (!ASN1_STRING_cmp(id->zone, zone))
                         return id->user;
         }
         return NULL;