[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  6670d55a847f8f2415842bc085150e838d4aac5d (commit)
      from  8162f6f58aa784e242941d1168fb8fc0618cf0a2 (commit)


- Log -----------------------------------------------------------------
commit 6670d55a847f8f2415842bc085150e838d4aac5d
Author: Rich Salz <rsalz at openssl.org>
Date:   Sun Jun 5 15:51:35 2016 -0400

    Make a2i_ipadd an internal function
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/include/internal/x509_int.h | 2 ++
 crypto/x509/x509_vpm.c             | 1 +
 include/openssl/x509v3.h           | 1 -
 util/libcrypto.num                 | 1 -
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/crypto/include/internal/x509_int.h b/crypto/include/internal/x509_int.h
index d8ec623..6df2919 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 194d09b..05c7852 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 13f7f22..c242a4d 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 a87fc25..6eae0c2 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: