summaryrefslogtreecommitdiff
path: root/src/lib/crypt.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/crypt.c')
-rw-r--r--src/lib/crypt.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/lib/crypt.c b/src/lib/crypt.c
index f3b7076d..ad679501 100644
--- a/src/lib/crypt.c
+++ b/src/lib/crypt.c
@@ -182,15 +182,14 @@ static void openssl_ecdh_pkp_destroy(void * pkp)
}
static int openssl_ecdh_derive(void * pkp,
- uint8_t * pk,
- size_t len,
+ buffer_t pk,
uint8_t * s)
{
uint8_t * pos;
EVP_PKEY * pub;
- pos = pk; /* d2i_PUBKEY increments the pointer, don't use key ptr! */
- pub = d2i_PUBKEY(NULL, (const uint8_t **) &pos, (long) len);
+ pos = pk.data; /* d2i_PUBKEY increments the pointer, don't use key ptr! */
+ pub = d2i_PUBKEY(NULL, (const uint8_t **) &pos, (long) pk.len);
if (pub == NULL)
return -ECRYPT;
@@ -390,16 +389,14 @@ void crypt_dh_pkp_destroy(void * pkp)
}
int crypt_dh_derive(void * pkp,
- uint8_t * pk,
- size_t len,
+ buffer_t pk,
uint8_t * s)
{
#ifdef HAVE_OPENSSL
- return openssl_ecdh_derive(pkp, pk, len, s);
+ return openssl_ecdh_derive(pkp, pk, s);
#else
(void) pkp;
(void) pk;
- (void) len;
memset(s, 0, SYMMKEYSZ);