diff options
author | Richard Levitte <levitte@openssl.org> | 2017-04-12 11:52:52 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2017-04-13 10:23:31 +0200 |
commit | 9612e15760784c59d3104bfe49e75323e5776bb1 (patch) | |
tree | 69bf10276e457244f28e250b913628458b0e10e8 /crypto/asn1 | |
parent | da26ff3085d895cb732150d1766d3d75dbb85338 (diff) |
ASN.1: adapt our use of INTxx et al by making them explicitely embedded
Fixes #3191
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3199)
Diffstat (limited to 'crypto/asn1')
-rw-r--r-- | crypto/asn1/evp_asn1.c | 2 | ||||
-rw-r--r-- | crypto/asn1/n_pkey.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crypto/asn1/evp_asn1.c b/crypto/asn1/evp_asn1.c index 718e688c01..f3b675e379 100644 --- a/crypto/asn1/evp_asn1.c +++ b/crypto/asn1/evp_asn1.c @@ -52,7 +52,7 @@ typedef struct { } asn1_int_oct; ASN1_SEQUENCE(asn1_int_oct) = { - ASN1_SIMPLE(asn1_int_oct, num, INT32), + ASN1_EMBED(asn1_int_oct, num, INT32), ASN1_SIMPLE(asn1_int_oct, oct, ASN1_OCTET_STRING) } static_ASN1_SEQUENCE_END(asn1_int_oct) diff --git a/crypto/asn1/n_pkey.c b/crypto/asn1/n_pkey.c index 34a0d03150..d1fb8a146d 100644 --- a/crypto/asn1/n_pkey.c +++ b/crypto/asn1/n_pkey.c @@ -48,7 +48,7 @@ DECLARE_ASN1_ENCODE_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY,NETSCAPE_ENCRYPTED_P IMPLEMENT_ASN1_FUNCTIONS_const(NETSCAPE_ENCRYPTED_PKEY) ASN1_SEQUENCE(NETSCAPE_PKEY) = { - ASN1_SIMPLE(NETSCAPE_PKEY, version, INT32), + ASN1_EMBED(NETSCAPE_PKEY, version, INT32), ASN1_SIMPLE(NETSCAPE_PKEY, algor, X509_ALGOR), ASN1_SIMPLE(NETSCAPE_PKEY, private_key, ASN1_OCTET_STRING) } static_ASN1_SEQUENCE_END(NETSCAPE_PKEY) |