4 files changed, 13 insertions, 13 deletions

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;