diff options
| author | Matt Caswell <matt@openssl.org> | 2020-11-12 14:55:31 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-12-08 10:18:44 +0000 |
| commit | 41d62636fd996c031c0c7cef746476278583dc9e (patch) | |
| tree | 4ed66cf612c1d5d848e8ae3cca0d1dce41d2092f /include | |
| parent | 1ecc76f6746cefd502c7e9000bdfa4e5d7911386 (diff) | |
Complain if we are attempting to encode with an invalid ASN.1 template
It never makes sense for multi-string or CHOICE types to have implicit
tagging. If we have a template that uses the in this way then we
should immediately fail.
Thanks to David Benjamin from Google for reporting this issue.
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/asn1err.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/openssl/asn1err.h b/include/openssl/asn1err.h index 9070e26df4..e1ad1fefec 100644 --- a/include/openssl/asn1err.h +++ b/include/openssl/asn1err.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2020 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 @@ -11,9 +11,7 @@ #ifndef HEADER_ASN1ERR_H # define HEADER_ASN1ERR_H -# ifndef HEADER_SYMHACKS_H -# include <openssl/symhacks.h> -# endif +# include <openssl/symhacks.h> # ifdef __cplusplus extern "C" @@ -53,6 +51,7 @@ int ERR_load_ASN1_strings(void); # define ASN1_F_ASN1_ITEM_DUP 191 # define ASN1_F_ASN1_ITEM_EMBED_D2I 120 # define ASN1_F_ASN1_ITEM_EMBED_NEW 121 +# define ASN1_F_ASN1_ITEM_EX_I2D 144 # define ASN1_F_ASN1_ITEM_FLAGS_I2D 118 # define ASN1_F_ASN1_ITEM_I2D_BIO 192 # define ASN1_F_ASN1_ITEM_I2D_FP 193 |