diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-01-28 20:34:51 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-01-29 00:41:35 +0100 |
| commit | 987157f6f63fa70dbeffca3c8bc62f26e9767ff2 (patch) | |
| tree | 17d2a16262bd988e173e8fd93d9d7a9405a59e04 /crypto | |
| parent | Remove extraneous output from util/mk scripts (diff) | |
| download | openssl-987157f6f63fa70dbeffca3c8bc62f26e9767ff2.tar.xz openssl-987157f6f63fa70dbeffca3c8bc62f26e9767ff2.zip | |
Use callback for DSAPublicKey
PR#4277
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/dsa/dsa_asn1.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c index b83f141bfc..44696c372f 100644 --- a/crypto/dsa/dsa_asn1.c +++ b/crypto/dsa/dsa_asn1.c @@ -125,18 +125,12 @@ ASN1_SEQUENCE_cb(DSAparams, dsa_cb) = { IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA, DSAparams, DSAparams) -/* - * DSA public key is a bit trickier... its effectively a CHOICE type decided - * by a field called write_params which can either write out just the public - * key as an INTEGER or the parameters and public key in a SEQUENCE - */ - -ASN1_SEQUENCE(DSAPublicKey) = { +ASN1_SEQUENCE_cb(DSAPublicKey, dsa_cb) = { ASN1_SIMPLE(DSA, pub_key, BIGNUM), ASN1_SIMPLE(DSA, p, BIGNUM), ASN1_SIMPLE(DSA, q, BIGNUM), ASN1_SIMPLE(DSA, g, BIGNUM) -} static_ASN1_SEQUENCE_END_name(DSA, DSAPublicKey) +} static_ASN1_SEQUENCE_END_cb(DSA, DSAPublicKey) IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(DSA, DSAPublicKey, DSAPublicKey) |