diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2010-07-26 18:15:59 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2010-07-26 18:15:59 +0000 |
| commit | eb1c48be6f27180fbb0622ea3ed26ea683f78869 (patch) | |
| tree | e8494fd714dc70cf0ef620d576a6118e67dc352e /crypto/cms | |
| parent | 2fd9664b0b7464b6ce512eb78815928590d860c6 (diff) | |
Add new type ossl_ssize_t instead of ssize_t and move definitions to
e_os2.h, this should fix WIN32 compilation issues and hopefully avoid
conflicts with other headers which may workaround ssize_t in different ways.
Diffstat (limited to 'crypto/cms')
| -rw-r--r-- | crypto/cms/cms.h | 8 | ||||
| -rw-r--r-- | crypto/cms/cms_pwri.c | 5 | ||||
| -rw-r--r-- | crypto/cms/cms_smime.c | 2 |
3 files changed, 9 insertions, 6 deletions
diff --git a/crypto/cms/cms.h b/crypto/cms/cms.h index 8d230219f7..c48c82863e 100644 --- a/crypto/cms/cms.h +++ b/crypto/cms/cms.h @@ -185,7 +185,7 @@ int CMS_decrypt_set1_key(CMS_ContentInfo *cms, unsigned char *key, size_t keylen, unsigned char *id, size_t idlen); int CMS_decrypt_set1_password(CMS_ContentInfo *cms, - unsigned char *pass, ssize_t passlen); + unsigned char *pass, ossl_ssize_t passlen); STACK_OF(CMS_RecipientInfo) *CMS_get0_RecipientInfos(CMS_ContentInfo *cms); int CMS_RecipientInfo_type(CMS_RecipientInfo *ri); @@ -222,11 +222,13 @@ int CMS_RecipientInfo_kekri_id_cmp(CMS_RecipientInfo *ri, const unsigned char *id, size_t idlen); int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, - unsigned char *pass, ssize_t passlen); + unsigned char *pass, + ossl_ssize_t passlen); CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms, int iter, int wrap_nid, int pbe_nid, - unsigned char *pass, ssize_t passlen, + unsigned char *pass, + ossl_ssize_t passlen, const EVP_CIPHER *kekciph); int CMS_RecipientInfo_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri); diff --git a/crypto/cms/cms_pwri.c b/crypto/cms/cms_pwri.c index 5fe7f494bd..b79612a12d 100644 --- a/crypto/cms/cms_pwri.c +++ b/crypto/cms/cms_pwri.c @@ -63,7 +63,7 @@ #include "asn1_locl.h" int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, - unsigned char *pass, ssize_t passlen) + unsigned char *pass, ossl_ssize_t passlen) { CMS_PasswordRecipientInfo *pwri; if (ri->type != CMS_RECIPINFO_PASS) @@ -82,7 +82,8 @@ int CMS_RecipientInfo_set0_password(CMS_RecipientInfo *ri, CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms, int iter, int wrap_nid, int pbe_nid, - unsigned char *pass, ssize_t passlen, + unsigned char *pass, + ossl_ssize_t passlen, const EVP_CIPHER *kekciph) { CMS_RecipientInfo *ri = NULL; diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index ab38a258e5..a40307605b 100644 --- a/crypto/cms/cms_smime.c +++ b/crypto/cms/cms_smime.c @@ -682,7 +682,7 @@ int CMS_decrypt_set1_key(CMS_ContentInfo *cms, } int CMS_decrypt_set1_password(CMS_ContentInfo *cms, - unsigned char *pass, ssize_t passlen) + unsigned char *pass, ossl_ssize_t passlen) { STACK_OF(CMS_RecipientInfo) *ris; CMS_RecipientInfo *ri; |