diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2013-07-30 18:05:08 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-10-01 14:01:18 +0100 |
| commit | 5c4ff8ad37302e982edbb405f810492350885060 (patch) | |
| tree | e7d80dd1ee63f1be6ccda319c2283494bc6aaafa /crypto/ossl_typ.h | |
| parent | dc427fc8e2f5f1212e4fe2c00409ab220bc0ebe1 (diff) | |
Add KDF for DH.
Add X9.42 DH KDF. Move sharedinfo generation code to CMS library as the
same structure is used by DH and ECDH.
Move ASN1_OBJECT typedef to ossl_typ.h so it can be picked up by dh headers
without the need to use ASN1.
(cherry picked from commit dc1ce3bc64845d16314af1f11acf5384e4ae9b34)
Diffstat (limited to 'crypto/ossl_typ.h')
| -rw-r--r-- | crypto/ossl_typ.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/ossl_typ.h b/crypto/ossl_typ.h index ea9227f6f9..d26196df42 100644 --- a/crypto/ossl_typ.h +++ b/crypto/ossl_typ.h @@ -96,6 +96,8 @@ typedef int ASN1_BOOLEAN; typedef int ASN1_NULL; #endif +typedef struct asn1_object_st ASN1_OBJECT; + typedef struct ASN1_ITEM_st ASN1_ITEM; typedef struct asn1_pctx_st ASN1_PCTX; |