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 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/libcrypto/x509/x509_r2x.c')

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;
-- 
cgit v1.2.3-55-g6feb