From 1c7e31c2bbb07475f068a459f144cb492d148ec2 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Wed, 30 Sep 2015 17:30:16 +0000
Subject: Replace M_ASN1_INTEGER_(new|free) with ASN1_INTEGER_(new|free) - this
 is different from the macro expansion, but the result is the same. Also
 replace some ASN1_STRING_dup() with ASN1_INTEGER_dup().

ok beck@ doug@
---
 src/lib/libcrypto/x509/x509_r2x.c | 4 ++--
 src/lib/libcrypto/x509/x509_req.c | 4 ++--
 src/lib/libcrypto/x509/x509_set.c | 8 ++++----
 src/lib/libcrypto/x509/x509cset.c | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/lib/libcrypto/x509')

diff --git a/src/lib/libcrypto/x509/x509_r2x.c b/src/lib/libcrypto/x509/x509_r2x.c
index 9a9a59d9bb..76faa29b7f 100644
--- a/src/lib/libcrypto/x509/x509_r2x.c
+++ b/src/lib/libcrypto/x509/x509_r2x.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_r2x.c,v 1.9 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: x509_r2x.c,v 1.10 2015/09/30 17:30:16 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -82,7 +82,7 @@ X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
 	xi = ret->cert_info;
 
 	if (sk_X509_ATTRIBUTE_num(r->req_info->attributes) != 0) {
-		if ((xi->version = M_ASN1_INTEGER_new()) == NULL)
+		if ((xi->version = ASN1_INTEGER_new()) == NULL)
 			goto err;
 		if (!ASN1_INTEGER_set(xi->version, 2))
 			goto err;
diff --git a/src/lib/libcrypto/x509/x509_req.c b/src/lib/libcrypto/x509/x509_req.c
index 8813f372cc..dc4bc2639a 100644
--- a/src/lib/libcrypto/x509/x509_req.c
+++ b/src/lib/libcrypto/x509/x509_req.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_req.c,v 1.17 2015/03/15 22:52:17 doug Exp $ */
+/* $OpenBSD: x509_req.c,v 1.18 2015/09/30 17:30:16 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -86,7 +86,7 @@ X509_to_X509_REQ(X509 *x, EVP_PKEY *pkey, const EVP_MD *md)
 
 	ri = ret->req_info;
 
-	if ((ri->version = M_ASN1_INTEGER_new()) == NULL)
+	if ((ri->version = ASN1_INTEGER_new()) == NULL)
 		goto err;
 	if (ASN1_INTEGER_set(ri->version, 0) == 0)
 		goto err;
diff --git a/src/lib/libcrypto/x509/x509_set.c b/src/lib/libcrypto/x509/x509_set.c
index c6160b90b0..e77b49ea95 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.10 2015/07/29 14:58:34 jsing Exp $ */
+/* $OpenBSD: x509_set.c,v 1.11 2015/09/30 17:30:16 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -69,7 +69,7 @@ X509_set_version(X509 *x, long version)
 	if (x == NULL)
 		return (0);
 	if (x->cert_info->version == NULL) {
-		if ((x->cert_info->version = M_ASN1_INTEGER_new()) == NULL)
+		if ((x->cert_info->version = ASN1_INTEGER_new()) == NULL)
 			return (0);
 	}
 	return (ASN1_INTEGER_set(x->cert_info->version, version));
@@ -84,9 +84,9 @@ X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial)
 		return (0);
 	in = x->cert_info->serialNumber;
 	if (in != serial) {
-		in = ASN1_STRING_dup(serial);
+		in = ASN1_INTEGER_dup(serial);
 		if (in != NULL) {
-			M_ASN1_INTEGER_free(x->cert_info->serialNumber);
+			ASN1_INTEGER_free(x->cert_info->serialNumber);
 			x->cert_info->serialNumber = in;
 		}
 	}
diff --git a/src/lib/libcrypto/x509/x509cset.c b/src/lib/libcrypto/x509/x509cset.c
index 94c419301a..a0fbdfbc3b 100644
--- a/src/lib/libcrypto/x509/x509cset.c
+++ b/src/lib/libcrypto/x509/x509cset.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509cset.c,v 1.9 2015/07/29 14:58:34 jsing Exp $ */
+/* $OpenBSD: x509cset.c,v 1.10 2015/09/30 17:30:16 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2001.
  */
@@ -69,7 +69,7 @@ X509_CRL_set_version(X509_CRL *x, long version)
 	if (x == NULL)
 		return (0);
 	if (x->crl->version == NULL) {
-		if ((x->crl->version = M_ASN1_INTEGER_new()) == NULL)
+		if ((x->crl->version = ASN1_INTEGER_new()) == NULL)
 			return (0);
 	}
 	return (ASN1_INTEGER_set(x->crl->version, version));
@@ -163,9 +163,9 @@ X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial)
 		return (0);
 	in = x->serialNumber;
 	if (in != serial) {
-		in = ASN1_STRING_dup(serial);
+		in = ASN1_INTEGER_dup(serial);
 		if (in != NULL) {
-			M_ASN1_INTEGER_free(x->serialNumber);
+			ASN1_INTEGER_free(x->serialNumber);
 			x->serialNumber = in;
 		}
 	}
-- 
cgit v1.2.3-55-g6feb