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

Fix compile errors.

Browse Source 
(cherry picked from commit a0aaa5660a29f0faa86e5e51ce889299c5f3098b)
This commit is contained in:
Ben Laurie 2013-08-21 04:21:42 +01:00 committed by Dr. Stephen Henson
parent aaf74259ec
commit ac5cb33356
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/dh/dh_ameth.c
View File

@ -673,12 +673,13 @@ static int dh_cms_set_peerkey(EVP_PKEY_CTX *pctx,
ASN1_OBJECT *aoid; ASN1_OBJECT *aoid;
int atype; int atype;
void *aval; void *aval;
ASN1_INTEGER *public_key; ASN1_INTEGER *public_key = NULL;
int rv = 0; int rv = 0;
EVP_PKEY *pkpeer = NULL, *pk = NULL; EVP_PKEY *pkpeer = NULL, *pk = NULL;
DH *dhpeer = NULL; DH *dhpeer = NULL;
const unsigned char *p; const unsigned char *p;
int plen; int plen;
X509_ALGOR_get0(&aoid, &atype, &aval, alg); X509_ALGOR_get0(&aoid, &atype, &aval, alg);
if (OBJ_obj2nid(aoid) != NID_dhpublicnumber) if (OBJ_obj2nid(aoid) != NID_dhpublicnumber)
goto err; goto err;
@ -737,7 +738,7 @@ static int dh_cms_set_shared_info(EVP_PKEY_CTX *pctx, CMS_RecipientInfo *ri)
ASN1_OCTET_STRING *ukm; ASN1_OCTET_STRING *ukm;
const unsigned char *p; const unsigned char *p;
unsigned char *dukm = NULL; unsigned char *dukm = NULL;
size_t dukmlen; size_t dukmlen = 0;
int keylen, plen; int keylen, plen;
const EVP_CIPHER *kekcipher; const EVP_CIPHER *kekcipher;
EVP_CIPHER_CTX *kekctx; EVP_CIPHER_CTX *kekctx;
@ -852,7 +853,7 @@ static int dh_cms_encrypt(CMS_RecipientInfo *ri)
ASN1_OCTET_STRING *ukm; ASN1_OCTET_STRING *ukm;
unsigned char *penc = NULL, *dukm = NULL; unsigned char *penc = NULL, *dukm = NULL;
int penclen; int penclen;
size_t dukmlen; size_t dukmlen = 0;
int rv = 0; int rv = 0;
int kdf_type, wrap_nid; int kdf_type, wrap_nid;
const EVP_MD *kdf_md; const EVP_MD *kdf_md;