diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-03-30 13:33:20 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-04-04 10:56:49 +0200 |
| commit | 93c2fb6f2706b2f2836128436f4541bd22e9ff40 (patch) | |
| tree | 98ccad3ca6bc852a1ad97503b8870d72fb29ced4 /crypto/asn1 | |
| parent | 150fe6b6ea2c67b24ec7b5d8da33a8452e4a125f (diff) | |
make update
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3120)
Diffstat (limited to 'crypto/asn1')
| -rw-r--r-- | crypto/asn1/asn1_err.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/asn1/asn1_err.c b/crypto/asn1/asn1_err.c index 97c3dec923..dd0e99e624 100644 --- a/crypto/asn1/asn1_err.c +++ b/crypto/asn1/asn1_err.c @@ -1,6 +1,6 @@ /* * 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"}, |