diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2018-04-26 18:06:17 +0200 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2018-04-26 18:27:46 +0200 |
| commit | f06080cb3da93e99755edb5f19e7ccc132aeba36 (patch) | |
| tree | 5af1d6860ee8f6f8305a77190fa1f3bc4fcc336b /crypto/pkcs12/pk12err.c | |
| parent | Update the *use_certificate* docs (diff) | |
| download | openssl-f06080cb3da93e99755edb5f19e7ccc132aeba36.tar.xz openssl-f06080cb3da93e99755edb5f19e7ccc132aeba36.zip | |
Add missing error code when alloc-return-null
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6085)
Diffstat (limited to 'crypto/pkcs12/pk12err.c')
| -rw-r--r-- | crypto/pkcs12/pk12err.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/crypto/pkcs12/pk12err.c b/crypto/pkcs12/pk12err.c index 38e7c66eb5..38ce5197ee 100644 --- a/crypto/pkcs12/pk12err.c +++ b/crypto/pkcs12/pk12err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2018 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 @@ -14,6 +14,12 @@ #ifndef OPENSSL_NO_ERR static const ERR_STRING_DATA PKCS12_str_functs[] = { + {ERR_PACK(ERR_LIB_PKCS12, PKCS12_F_OPENSSL_ASC2UNI, 0), "OPENSSL_asc2uni"}, + {ERR_PACK(ERR_LIB_PKCS12, PKCS12_F_OPENSSL_UNI2ASC, 0), "OPENSSL_uni2asc"}, + {ERR_PACK(ERR_LIB_PKCS12, PKCS12_F_OPENSSL_UNI2UTF8, 0), + "OPENSSL_uni2utf8"}, + {ERR_PACK(ERR_LIB_PKCS12, PKCS12_F_OPENSSL_UTF82UNI, 0), + "OPENSSL_utf82uni"}, {ERR_PACK(ERR_LIB_PKCS12, PKCS12_F_PKCS12_CREATE, 0), "PKCS12_create"}, {ERR_PACK(ERR_LIB_PKCS12, PKCS12_F_PKCS12_GEN_MAC, 0), "PKCS12_gen_mac"}, {ERR_PACK(ERR_LIB_PKCS12, PKCS12_F_PKCS12_INIT, 0), "PKCS12_init"}, |