From 6c4b3514d740020be9bf7c757930f8ca536622ee Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Tue, 8 Mar 2011 19:07:26 +0000 Subject: [PATCH] New SP 800-56A compliant version of DH_compute_key(). (cherry picked from commit bc91494e064ebdcff68f987947f97e404fbca0b5) --- crypto/dh/dh.h | 1 + crypto/dh/dh_key.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h index 523d3464ac6..a4095c1adbc 100644 --- a/crypto/dh/dh.h +++ b/crypto/dh/dh.h @@ -213,6 +213,7 @@ int DH_check(const DH *dh,int *codes); int DH_check_pub_key(const DH *dh,const BIGNUM *pub_key, int *codes); int DH_generate_key(DH *dh); int DH_compute_key(unsigned char *key,const BIGNUM *pub_key,DH *dh); +int DH_compute_key_padded(unsigned char *key,const BIGNUM *pub_key,DH *dh); DH * d2i_DHparams(DH **a,const unsigned char **pp, long length); int i2d_DHparams(const DH *a,unsigned char **pp); DH * d2i_DHxparams(DH **a,const unsigned char **pp, long length); diff --git a/crypto/dh/dh_key.c b/crypto/dh/dh_key.c index 89a74db4e69..6cb0d022563 100644 --- a/crypto/dh/dh_key.c +++ b/crypto/dh/dh_key.c @@ -97,6 +97,21 @@ int DH_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) return dh->meth->compute_key(key, pub_key, dh); } +int DH_compute_key_padded(unsigned char *key, const BIGNUM *pub_key, DH *dh) + { + int rv, pad; + rv = dh->meth->compute_key(key, pub_key, dh); + if (rv <= 0) + return rv; + pad = BN_num_bytes(dh->p) - rv; + if (pad > 0) + { + memmove(key + pad, key, rv); + memset(key, 0, pad); + } + return rv + pad; + } + static DH_METHOD dh_ossl = { "OpenSSL DH Method", generate_key, -- 2.47.3