diff options
| author |   jsing <jsing@openbsd.org> | 2015-07-25 17:08:40 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2015-07-25 17:08:40 +0000 |
| commit | e007f855cd00ba7923c04a20770d8e1be38f417a (patch) | |
| tree | faa712fe320cad936c7049943ecac7160b36aee3 /lib/libssl/src | |
| parent | Manually expand ASN.1 template macros - only change in generated assembly (diff) | |
| download | wireguard-openbsd-e007f855cd00ba7923c04a20770d8e1be38f417a.tar.xz wireguard-openbsd-e007f855cd00ba7923c04a20770d8e1be38f417a.zip | |
Expand another ASN.1 template macro that snuck through last time around.
No change in generated assembly.
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/crypto/pkcs12/p12_asn.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/libssl/src/crypto/pkcs12/p12_asn.c b/lib/libssl/src/crypto/pkcs12/p12_asn.c index eb8e30cf471..3baf8f43d5c 100644 --- a/lib/libssl/src/crypto/pkcs12/p12_asn.c +++ b/lib/libssl/src/crypto/pkcs12/p12_asn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p12_asn.c,v 1.8 2015/07/25 15:42:14 jsing Exp $ */ +/* $OpenBSD: p12_asn.c,v 1.9 2015/07/25 17:08:40 jsing Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -323,7 +323,13 @@ static const ASN1_ADB_TABLE PKCS12_SAFEBAG_adbtbl[] = { }, { .value = NID_safeContentsBag, - .tt = ASN1_EXP_SET_OF(PKCS12_SAFEBAG, value.safes, PKCS12_SAFEBAG, 0) + .tt = { + .flags = ASN1_TFLG_EXPLICIT | ASN1_TFLG_SET_OF, + .tag = 0, + .offset = offsetof(PKCS12_SAFEBAG, value.safes), + .field_name = "value.safes", + .item = &PKCS12_SAFEBAG_it, + }, }, { .value = NID_certBag, |