diff options
Diffstat (limited to 'openssl/trunk')
| -rw-r--r-- | openssl/trunk/crypto/x509v3/v3err.c | 3 | ||||
| -rw-r--r-- | openssl/trunk/crypto/x509v3/x509v3.h | 13 | ||||
| -rwxr-xr-x | openssl/trunk/util/libeay.num | 7 |
3 files changed, 12 insertions, 11 deletions
diff --git a/openssl/trunk/crypto/x509v3/v3err.c b/openssl/trunk/crypto/x509v3/v3err.c index 724565e3..1856a5c7 100644 --- a/openssl/trunk/crypto/x509v3/v3err.c +++ b/openssl/trunk/crypto/x509v3/v3err.c @@ -72,8 +72,6 @@ static ERR_STRING_DATA X509V3_str_functs[]= { {ERR_FUNC(X509V3_F_ASIDENTIFIERCHOICE_CANONIZE), "ASIDENTIFIERCHOICE_CANONIZE"}, {ERR_FUNC(X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL), "ASIDENTIFIERCHOICE_IS_CANONICAL"}, -{ERR_FUNC(X509V3_F_ASID_CANONIZE), "ASID_CANONIZE"}, -{ERR_FUNC(X509V3_F_ASID_IS_CANONICAL), "ASID_IS_CANONICAL"}, {ERR_FUNC(X509V3_F_COPY_EMAIL), "COPY_EMAIL"}, {ERR_FUNC(X509V3_F_COPY_ISSUER), "COPY_ISSUER"}, {ERR_FUNC(X509V3_F_DO_DIRNAME), "DO_DIRNAME"}, @@ -118,7 +116,6 @@ static ERR_STRING_DATA X509V3_str_functs[]= {ERR_FUNC(X509V3_F_V2I_POLICY_CONSTRAINTS), "V2I_POLICY_CONSTRAINTS"}, {ERR_FUNC(X509V3_F_V2I_POLICY_MAPPINGS), "V2I_POLICY_MAPPINGS"}, {ERR_FUNC(X509V3_F_V2I_SUBJECT_ALT), "V2I_SUBJECT_ALT"}, -{ERR_FUNC(X509V3_F_V3_ADDR_VALIDATE_PATH), "v3_addr_validate_path"}, {ERR_FUNC(X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL), "V3_ADDR_VALIDATE_PATH_INTERNAL"}, {ERR_FUNC(X509V3_F_V3_GENERIC_EXTENSION), "V3_GENERIC_EXTENSION"}, {ERR_FUNC(X509V3_F_X509V3_ADD1_I2D), "X509V3_add1_i2d"}, diff --git a/openssl/trunk/crypto/x509v3/x509v3.h b/openssl/trunk/crypto/x509v3/x509v3.h index 27919d02..57bc3de2 100644 --- a/openssl/trunk/crypto/x509v3/x509v3.h +++ b/openssl/trunk/crypto/x509v3/x509v3.h @@ -755,10 +755,8 @@ void ERR_load_X509V3_strings(void); /* Error codes for the X509V3 functions. */ /* Function codes. */ -#define X509V3_F_ASIDENTIFIERCHOICE_CANONIZE 161 -#define X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL 162 -#define X509V3_F_ASID_CANONIZE 159 -#define X509V3_F_ASID_IS_CANONICAL 158 +#define X509V3_F_ASIDENTIFIERCHOICE_CANONIZE 156 +#define X509V3_F_ASIDENTIFIERCHOICE_IS_CANONICAL 157 #define X509V3_F_COPY_EMAIL 122 #define X509V3_F_COPY_ISSUER 123 #define X509V3_F_DO_DIRNAME 144 @@ -788,7 +786,7 @@ void ERR_load_X509V3_strings(void); #define X509V3_F_SXNET_ADD_ID_ULONG 127 #define X509V3_F_SXNET_GET_ID_ASC 128 #define X509V3_F_SXNET_GET_ID_ULONG 129 -#define X509V3_F_V2I_ASIDENTIFIERS 156 +#define X509V3_F_V2I_ASIDENTIFIERS 158 #define X509V3_F_V2I_ASN1_BIT_STRING 101 #define X509V3_F_V2I_AUTHORITY_INFO_ACCESS 139 #define X509V3_F_V2I_AUTHORITY_KEYID 119 @@ -797,14 +795,13 @@ void ERR_load_X509V3_strings(void); #define X509V3_F_V2I_EXTENDED_KEY_USAGE 103 #define X509V3_F_V2I_GENERAL_NAMES 118 #define X509V3_F_V2I_GENERAL_NAME_EX 117 -#define X509V3_F_V2I_IPADDRBLOCKS 157 +#define X509V3_F_V2I_IPADDRBLOCKS 159 #define X509V3_F_V2I_ISSUER_ALT 153 #define X509V3_F_V2I_NAME_CONSTRAINTS 147 #define X509V3_F_V2I_POLICY_CONSTRAINTS 146 #define X509V3_F_V2I_POLICY_MAPPINGS 145 #define X509V3_F_V2I_SUBJECT_ALT 154 -#define X509V3_F_V3_ADDR_VALIDATE_PATH 160 -#define X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL 163 +#define X509V3_F_V3_ADDR_VALIDATE_PATH_INTERNAL 160 #define X509V3_F_V3_GENERIC_EXTENSION 116 #define X509V3_F_X509V3_ADD1_I2D 140 #define X509V3_F_X509V3_ADD_VALUE 105 diff --git a/openssl/trunk/util/libeay.num b/openssl/trunk/util/libeay.num index ce26a2e4..6f6f11ef 100755 --- a/openssl/trunk/util/libeay.num +++ b/openssl/trunk/util/libeay.num @@ -3430,3 +3430,10 @@ d2i_ASIdOrRange 3822 EXIST::FUNCTION: i2d_ASIdentifiers 3823 EXIST::FUNCTION: v3_addr_validate_path 3824 EXIST::FUNCTION: v3_asid_validate_path 3825 EXIST::FUNCTION: +a2i_ipadd 3826 EXIST::FUNCTION: +v3_asid_is_canonical 3827 EXIST::FUNCTION: +v3_addr_validate_resource_set 3828 EXIST::FUNCTION: +v3_asid_canonize 3829 EXIST::FUNCTION: +v3_asid_validate_resource_set 3830 EXIST::FUNCTION: +v3_addr_is_canonical 3831 EXIST::FUNCTION: +v3_addr_canonize 3832 EXIST::FUNCTION: |