Commit 5c7e6548 authored by Richard Levitte's avatar Richard Levitte
Browse files

make update 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3088)
parent 93f7d6fc

crypto/asn1/asn1_err.c

+4 −1
Original line number Diff line number Diff line 
/*

 * Generated by util/mkerr.pl DO NOT EDIT

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy
@@ -85,6 +85,7 @@ static ERR_STRING_DATA ASN1_str_functs[] = { 
    {ERR_FUNC(ASN1_F_C2I_ASN1_INTEGER), "c2i_ASN1_INTEGER"},

    {ERR_FUNC(ASN1_F_C2I_ASN1_OBJECT), "c2i_ASN1_OBJECT"},

    {ERR_FUNC(ASN1_F_C2I_IBUF), "c2i_ibuf"},

    {ERR_FUNC(ASN1_F_C2I_UINT64_INT), "c2i_uint64_int"},

    {ERR_FUNC(ASN1_F_COLLECT_DATA), "collect_data"},

    {ERR_FUNC(ASN1_F_D2I_ASN1_OBJECT), "d2i_ASN1_OBJECT"},

    {ERR_FUNC(ASN1_F_D2I_ASN1_UINTEGER), "d2i_ASN1_UINTEGER"},
@@ -110,6 +111,8 @@ static ERR_STRING_DATA ASN1_str_functs[] = { 
    {ERR_FUNC(ASN1_F_SMIME_READ_ASN1), "SMIME_read_ASN1"},

    {ERR_FUNC(ASN1_F_SMIME_TEXT), "SMIME_text"},

    {ERR_FUNC(ASN1_F_STBL_MODULE_INIT), "stbl_module_init"},

    {ERR_FUNC(ASN1_F_UINT32_C2I), "uint32_c2i"},

    {ERR_FUNC(ASN1_F_UINT64_C2I), "uint64_c2i"},

    {ERR_FUNC(ASN1_F_X509_CRL_ADD0_REVOKED), "X509_CRL_add0_revoked"},

    {ERR_FUNC(ASN1_F_X509_INFO_NEW), "X509_INFO_new"},

    {ERR_FUNC(ASN1_F_X509_NAME_ENCODE), "x509_name_encode"},

include/openssl/asn1.h

+3 −0
Original line number Diff line number Diff line
@@ -949,6 +949,7 @@ int ERR_load_ASN1_strings(void); 
# define ASN1_F_C2I_ASN1_INTEGER                          194

# define ASN1_F_C2I_ASN1_OBJECT                           196

# define ASN1_F_C2I_IBUF                                  226

# define ASN1_F_C2I_UINT64_INT                            101

# define ASN1_F_COLLECT_DATA                              140

# define ASN1_F_D2I_ASN1_OBJECT                           147

# define ASN1_F_D2I_ASN1_UINTEGER                         150
@@ -974,6 +975,8 @@ int ERR_load_ASN1_strings(void); 
# define ASN1_F_SMIME_READ_ASN1                           212

# define ASN1_F_SMIME_TEXT                                213

# define ASN1_F_STBL_MODULE_INIT                          223

# define ASN1_F_UINT32_C2I                                105

# define ASN1_F_UINT64_C2I                                112

# define ASN1_F_X509_CRL_ADD0_REVOKED                     169

# define ASN1_F_X509_INFO_NEW                             170

# define ASN1_F_X509_NAME_ENCODE                          203

util/libcrypto.num

+16 −0
Original line number Diff line number Diff line
@@ -4254,3 +4254,19 @@ EVP_aria_128_ctr 4204 1_1_1 EXIST::FUNCTION:ARIA 
EVP_aria_192_ctr                        4205	1_1_1	EXIST::FUNCTION:ARIA

UI_null                                 4206	1_1_1	EXIST::FUNCTION:UI

EC_KEY_get0_engine                      4207	1_1_1	EXIST::FUNCTION:EC

INT32_it                                4208	1_1_0f	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:

INT32_it                                4208	1_1_0f	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:

UINT64_it                               4209	1_1_0f	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:

UINT64_it                               4209	1_1_0f	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:

ZINT32_it                               4210	1_1_0f	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:

ZINT32_it                               4210	1_1_0f	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:

ZUINT64_it                              4211	1_1_0f	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:

ZUINT64_it                              4211	1_1_0f	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:

INT64_it                                4212	1_1_0f	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:

INT64_it                                4212	1_1_0f	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:

ZUINT32_it                              4213	1_1_0f	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:

ZUINT32_it                              4213	1_1_0f	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:

UINT32_it                               4214	1_1_0f	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:

UINT32_it                               4214	1_1_0f	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:

ZINT64_it                               4215	1_1_0f	EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:

ZINT64_it                               4215	1_1_0f	EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION: