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 d8ec623d85a8d36847a99e6d4b37756d6db33150..6df291980207043dbe064289ce967bafd1413796 100644 (file)
--- 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 194d09b36654617ddeb134bcfcd32a2d6aa6d9b0..05c785217aa70bf6c62805034774486ce7dba4c8 100644 (file)
--- 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 13f7f22f66b2d2bad473abd2573ec06d220ca6b8..c242a4dd6a82e54d8a3ab5074cce6025acc17cff 100644 (file)
--- 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 a87fc252bc556abb1c1fdc2eb28ae6e859da2b29..6eae0c2c2b0f35a246a025d7f3c00f9e84bd9d45 100644 (file)
--- 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: