From: Rich Salz <rsalz@openssl.org>
Date: Sun, 5 Jun 2016 19:51:35 +0000 (-0400)
Subject: Make a2i_ipadd an internal function
X-Git-Tag: OpenSSL_1_1_0-pre6~504
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=6670d55a847f8f2415842bc085150e838d4aac5d

Make a2i_ipadd an internal function

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/crypto/include/internal/x509_int.h b/crypto/include/internal/x509_int.h
index d8ec623d85..6df2919802 100644
--- a/crypto/include/internal/x509_int.h
+++ b/crypto/include/internal/x509_int.h
@@ -263,3 +263,5 @@ struct x509_object_st {
         EVP_PKEY *pkey;
     } data;
 };
+
+int a2i_ipadd(unsigned char *ipout, const char *ipasc);
diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c
index 194d09b366..05c785217a 100644
--- a/crypto/x509/x509_vpm.c
+++ b/crypto/x509/x509_vpm.c
@@ -15,6 +15,7 @@
 #include <openssl/buffer.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#include "internal/x509_int.h"
 
 #include "x509_lcl.h"
 
diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h
index 13f7f22f66..c242a4dd6a 100644
--- a/include/openssl/x509v3.h
+++ b/include/openssl/x509v3.h
@@ -710,7 +710,6 @@ int X509_check_ip_asc(X509 *x, const char *ipasc, unsigned int flags);
 
 ASN1_OCTET_STRING *a2i_IPADDRESS(const char *ipasc);
 ASN1_OCTET_STRING *a2i_IPADDRESS_NC(const char *ipasc);
-int a2i_ipadd(unsigned char *ipout, const char *ipasc);
 int X509V3_NAME_from_section(X509_NAME *nm, STACK_OF(CONF_VALUE) *dn_sk,
                              unsigned long chtype);
 
diff --git a/util/libcrypto.num b/util/libcrypto.num
index a87fc252bc..6eae0c2c2b 100644
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -2575,7 +2575,6 @@ X509_PURPOSE_add                        2537	1_1_0	EXIST::FUNCTION:
 PKCS7_ENVELOPE_free                     2538	1_1_0	EXIST::FUNCTION:
 PKCS12_key_gen_uni                      2539	1_1_0	EXIST::FUNCTION:
 WHIRLPOOL                               2540	1_1_0	EXIST::FUNCTION:WHIRLPOOL
-a2i_ipadd                               2541	1_1_0	EXIST::FUNCTION:
 UI_set_default_method                   2542	1_1_0	EXIST::FUNCTION:UI
 EC_POINT_is_at_infinity                 2543	1_1_0	EXIST::FUNCTION:EC
 i2d_NOTICEREF                           2544	1_1_0	EXIST::FUNCTION: