diff options
| author | Ralf S. Engelschall <rse@openssl.org> | 1998-12-21 11:00:56 +0000 |
|---|---|---|
| committer | Ralf S. Engelschall <rse@openssl.org> | 1998-12-21 11:00:56 +0000 |
| commit | dfeab0689f69c0b4bd3480ffd37a9cacc2f17d9c (patch) | |
| tree | 2f74e0cfd76a9e092548a9bf52e579aef984299b /crypto/asn1/p7_enc_c.c | |
| parent | 58964a492275ca9a59a0cd9c8155cb2491b4b909 (diff) | |
| download | openssl-dfeab0689f69c0b4bd3480ffd37a9cacc2f17d9c.tar.gz | |
Import of old SSLeay release: SSLeay 0.9.1b (unreleased)
Diffstat (limited to 'crypto/asn1/p7_enc_c.c')
| -rw-r--r-- | crypto/asn1/p7_enc_c.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/crypto/asn1/p7_enc_c.c b/crypto/asn1/p7_enc_c.c index 2860d3e925..f98afb51b8 100644 --- a/crypto/asn1/p7_enc_c.c +++ b/crypto/asn1/p7_enc_c.c @@ -62,8 +62,8 @@ #include "x509.h" /* - * ASN1err(ASN1_F_PKCS7_ENC_CONTENT_NEW,ASN1_R_LENGTH_MISMATCH); - * ASN1err(ASN1_F_D2I_PKCS7_ENC_CONTENT,ASN1_R_LENGTH_MISMATCH); + * ASN1err(ASN1_F_PKCS7_ENC_CONTENT_NEW,ERR_R_ASN1_LENGTH_MISMATCH); + * ASN1err(ASN1_F_D2I_PKCS7_ENC_CONTENT,ERR_R_ASN1_LENGTH_MISMATCH); */ int i2d_PKCS7_ENC_CONTENT(a,pp) @@ -106,9 +106,11 @@ long length; PKCS7_ENC_CONTENT *PKCS7_ENC_CONTENT_new() { PKCS7_ENC_CONTENT *ret=NULL; + ASN1_CTX c; M_ASN1_New_Malloc(ret,PKCS7_ENC_CONTENT); - M_ASN1_New(ret->content_type,ASN1_OBJECT_new); + /* M_ASN1_New(ret->content_type,ASN1_OBJECT_new); */ + ret->content_type=OBJ_nid2obj(NID_pkcs7_encrypted); M_ASN1_New(ret->algorithm,X509_ALGOR_new); ret->enc_data=NULL; return(ret); |