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 /test/asn1_encode_test.c | |
| 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 'test/asn1_encode_test.c')
| -rw-r--r-- | test/asn1_encode_test.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/asn1_encode_test.c b/test/asn1_encode_test.c index 91b1e58ece..a24b284866 100644 --- a/test/asn1_encode_test.c +++ b/test/asn1_encode_test.c @@ -276,8 +276,8 @@ typedef struct { ASN1_SEQUENCE(ASN1_INT32_DATA) = { ASN1_SIMPLE(ASN1_INT32_DATA, success, ASN1_FBOOLEAN), - ASN1_SIMPLE(ASN1_INT32_DATA, test_int32, INT32), - ASN1_EXP_OPT(ASN1_INT32_DATA, test_zint32, ZINT32, 0) + ASN1_EMBED(ASN1_INT32_DATA, test_int32, INT32), + ASN1_EXP_OPT_EMBED(ASN1_INT32_DATA, test_zint32, ZINT32, 0) } static_ASN1_SEQUENCE_END(ASN1_INT32_DATA) IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_INT32_DATA) @@ -323,8 +323,8 @@ typedef struct { ASN1_SEQUENCE(ASN1_UINT32_DATA) = { ASN1_SIMPLE(ASN1_UINT32_DATA, success, ASN1_FBOOLEAN), - ASN1_SIMPLE(ASN1_UINT32_DATA, test_uint32, UINT32), - ASN1_EXP_OPT(ASN1_UINT32_DATA, test_zuint32, ZUINT32, 0) + ASN1_EMBED(ASN1_UINT32_DATA, test_uint32, UINT32), + ASN1_EXP_OPT_EMBED(ASN1_UINT32_DATA, test_zuint32, ZUINT32, 0) } static_ASN1_SEQUENCE_END(ASN1_UINT32_DATA) IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_UINT32_DATA) @@ -370,8 +370,8 @@ typedef struct { ASN1_SEQUENCE(ASN1_INT64_DATA) = { ASN1_SIMPLE(ASN1_INT64_DATA, success, ASN1_FBOOLEAN), - ASN1_SIMPLE(ASN1_INT64_DATA, test_int64, INT64), - ASN1_EXP_OPT(ASN1_INT64_DATA, test_zint64, ZINT64, 0) + ASN1_EMBED(ASN1_INT64_DATA, test_int64, INT64), + ASN1_EXP_OPT_EMBED(ASN1_INT64_DATA, test_zint64, ZINT64, 0) } static_ASN1_SEQUENCE_END(ASN1_INT64_DATA) IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_INT64_DATA) @@ -418,8 +418,8 @@ typedef struct { ASN1_SEQUENCE(ASN1_UINT64_DATA) = { ASN1_SIMPLE(ASN1_UINT64_DATA, success, ASN1_FBOOLEAN), - ASN1_SIMPLE(ASN1_UINT64_DATA, test_uint64, UINT64), - ASN1_EXP_OPT(ASN1_UINT64_DATA, test_zuint64, ZUINT64, 0) + ASN1_EMBED(ASN1_UINT64_DATA, test_uint64, UINT64), + ASN1_EXP_OPT_EMBED(ASN1_UINT64_DATA, test_zuint64, ZUINT64, 0) } static_ASN1_SEQUENCE_END(ASN1_UINT64_DATA) IMPLEMENT_STATIC_ASN1_ENCODE_FUNCTIONS(ASN1_UINT64_DATA) |