generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New function to initialize a PKCS7 structure of type other.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2003-10-10 23:40:47 +00:00
parent 0602abf5bd
commit 8d9086dfa2
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES
View File

@ -4,6 +4,13 @@
Changes between 0.9.7c and 0.9.8 [xx XXX xxxx] Changes between 0.9.7c and 0.9.8 [xx XXX xxxx]
*) New function PKCS7_set0_type_other() this initializes a PKCS7
structure of type "other".
[Steve Henson]
*) Correctly initialize digested data content type in PKCS7_set_type().
[Steve Henson]
*) Fix prime generation loop in crypto/bn/bn_prime.pl by making *) Fix prime generation loop in crypto/bn/bn_prime.pl by making
sure the loop does correctly stop and breaking ("division by zero") sure the loop does correctly stop and breaking ("division by zero")
modulus operations are not performed. The (pre-generated) prime modulus operations are not performed. The (pre-generated) prime

7
crypto/pkcs7/pk7_lib.c
View File

@ -211,6 +211,13 @@ err:
return(0); return(0);
} }
int PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other)
{
p7->type = OBJ_nid2obj(type);
p7->d.other = other;
return 1;
}
int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi) int PKCS7_add_signer(PKCS7 *p7, PKCS7_SIGNER_INFO *psi)
{ {
int i,j,nid; int i,j,nid;

1
crypto/pkcs7/pkcs7.h
View File

@ -308,6 +308,7 @@ DECLARE_ASN1_NDEF_FUNCTION(PKCS7)
long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg); long PKCS7_ctrl(PKCS7 *p7, int cmd, long larg, char *parg);
int PKCS7_set_type(PKCS7 *p7, int type); int PKCS7_set_type(PKCS7 *p7, int type);
int PKCS7_set0_type_other(PKCS7 *p7, int type, ASN1_TYPE *other);
int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data); int PKCS7_set_content(PKCS7 *p7, PKCS7 *p7_data);
int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey, int PKCS7_SIGNER_INFO_set(PKCS7_SIGNER_INFO *p7i, X509 *x509, EVP_PKEY *pkey,
const EVP_MD *dgst); const EVP_MD *dgst);