aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/asn1/asn1.h
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2008-03-31 15:03:55 +0000
committerDr. Stephen Henson <steve@openssl.org>2008-03-31 15:03:55 +0000
commit2e86f0d8d7185993d8cca5158af61d13224c3c26 (patch)
tree308131c49aba8045da575d2f25c184a21073f96b /crypto/asn1/asn1.h
parente2a29d49ca8548f95ec1b92f2f443f0f9f416a58 (diff)
downloadopenssl-2e86f0d8d7185993d8cca5158af61d13224c3c26.tar.gz
Use correct headers for signed receipts. Use consistent naming.
Update cms-test.pl to support OpenSSL 0.9.8.
Diffstat (limited to 'crypto/asn1/asn1.h')
-rw-r--r--crypto/asn1/asn1.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/asn1/asn1.h b/crypto/asn1/asn1.h
index 6ab12a9df9..8185e1dbb5 100644
--- a/crypto/asn1/asn1.h
+++ b/crypto/asn1/asn1.h
@@ -324,7 +324,7 @@ typedef struct ASN1_VALUE_st ASN1_VALUE;
#define DECLARE_ASN1_FUNCTIONS_const(name) \
name *name##_new(void); \
- void name##_free(name *a);
+ void name##_free(name *a); \
#define DECLARE_ASN1_ALLOC_FUNCTIONS_name(type, name) \
type *name##_new(void); \
@@ -1126,10 +1126,10 @@ int PEM_write_bio_ASN1_stream(BIO *out, ASN1_VALUE *val, BIO *in, int flags,
const char *hdr,
const ASN1_ITEM *it);
int SMIME_write_ASN1(BIO *bio, ASN1_VALUE *val, BIO *data, int flags,
- int ctype_nid,
+ int ctype_nid, int econt_nid,
STACK_OF(X509_ALGOR) *mdalgs,
const ASN1_ITEM *it);
-ASN1_VALUE *SMIME_read_asn1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);
+ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);
int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
int SMIME_text(BIO *in, BIO *out);