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

Fix a variety of warnings generated by some elevated compiler-fascism,

Browse Source 
OPENSSL_NO_DEPRECATED, etc. Steve, please double-check the CMS stuff...
This commit is contained in:
Geoff Thorpe
2008-03-16 21:05:46 +00:00
parent 7c337e00d2
commit 1e26a8baed
33 changed files with 54 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/cms/cms_sd.c
View File

@@ -451,7 +451,7 @@ CMS_SignerInfo *CMS_add1_signer(CMS_ContentInfo *cms,
}
int CMS_add1_signingTime(CMS_SignerInfo *si, ASN1_TIME *t)
static int cms_add1_signingTime(CMS_SignerInfo *si, ASN1_TIME *t)
{
ASN1_TIME *tt;
int r = 0;
@@ -608,7 +608,7 @@ void CMS_SignerInfo_get0_algs(CMS_SignerInfo *si, EVP_PKEY **pk, X509 **signer,
*psig = si->signatureAlgorithm;
}
int cms_SignerInfo_content_sign(CMS_SignerInfo *si, BIO *chain)
static int cms_SignerInfo_content_sign(CMS_SignerInfo *si, BIO *chain)
{
EVP_MD_CTX mctx;
int r = 0;
@@ -699,7 +699,7 @@ int CMS_SignerInfo_sign(CMS_SignerInfo *si)
if (CMS_signed_get_attr_by_NID(si, NID_pkcs9_signingTime, -1) < 0)
{
if (!CMS_add1_signingTime(si, NULL))
if (!cms_add1_signingTime(si, NULL))
goto err;
}
@@ -856,7 +856,7 @@ int CMS_SignerInfo_verify_content(CMS_SignerInfo *si, BIO *chain)
CMS_R_UNABLE_TO_FINALIZE_CONTEXT);
goto err;
}
if (mlen != os->length)
if (mlen != (unsigned int)os->length)
{
CMSerr(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT,
CMS_R_MESSAGEDIGEST_ATTRIBUTE_WRONG_LENGTH);