Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
大约 1 年 前同步成功

通知 9
Star 18
Fork 1
T
Third Party Openssl

体验新版 GitCode，发现更多精彩内容 >>

提交 db0a1efc 编写于 作者: R Richard Levitte
浏览文件
操作

Certain reasons aren't really part of the engine framework, so let's 

make them ubsec-specific in the ubsec implementation.
上级 90745214
隐藏空白更改
内联 并排
Showing with 6 addition and 6 deletion
crypto/engine/hw_ubsec.c
浏览文件 @ db0a1efc
...@@ -855,7 +855,7 @@ static int ubsec_dh_compute_key (unsigned char *key,const BIGNUM *pub_key,DH *dh ...@@ -855,7 +855,7 @@ static int ubsec_dh_compute_key (unsigned char *key,const BIGNUM *pub_key,DH *dh
if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0) if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0)
{ {
const DH_METHOD *meth; const DH_METHOD *meth;
ENGINEerr(UBSEC_F_UBSEC_INIT, ENGINE_R_UNIT_FAILURE); ENGINEerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
meth = DH_OpenSSL(); meth = DH_OpenSSL();
ret = meth->compute_key(key, pub_key, dh); ret = meth->compute_key(key, pub_key, dh);
goto err; goto err;
...@@ -869,7 +869,7 @@ static int ubsec_dh_compute_key (unsigned char *key,const BIGNUM *pub_key,DH *dh ...@@ -869,7 +869,7 @@ static int ubsec_dh_compute_key (unsigned char *key,const BIGNUM *pub_key,DH *dh
{ {
/* Hardware's a no go, failover to software */ /* Hardware's a no go, failover to software */
const DH_METHOD *meth; const DH_METHOD *meth;
ENGINEerr(UBSEC_F_UBSEC_DH_COMPUTE_KEY, ENGINE_R_REQUEST_FAILED); ENGINEerr(UBSEC_F_UBSEC_DH_COMPUTE_KEY, UBSEC_R_REQUEST_FAILED);
p_UBSEC_ubsec_close(fd); p_UBSEC_ubsec_close(fd);
meth = DH_OpenSSL(); meth = DH_OpenSSL();
...@@ -931,7 +931,7 @@ static int ubsec_dh_generate_key (DH *dh) ...@@ -931,7 +931,7 @@ static int ubsec_dh_generate_key (DH *dh)
if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0) if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0)
{ {
const DH_METHOD *meth; const DH_METHOD *meth;
ENGINEerr(UBSEC_F_UBSEC_INIT, ENGINE_R_UNIT_FAILURE); ENGINEerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
meth = DH_OpenSSL(); meth = DH_OpenSSL();
ret = meth->generate_key(dh); ret = meth->generate_key(dh);
goto err; goto err;
...@@ -947,7 +947,7 @@ static int ubsec_dh_generate_key (DH *dh) ...@@ -947,7 +947,7 @@ static int ubsec_dh_generate_key (DH *dh)
/* Hardware's a no go, failover to software */ /* Hardware's a no go, failover to software */
const DH_METHOD *meth; const DH_METHOD *meth;
ENGINEerr(UBSEC_F_UBSEC_DH_COMPUTE_KEY, ENGINE_R_REQUEST_FAILED); ENGINEerr(UBSEC_F_UBSEC_DH_COMPUTE_KEY, UBSEC_R_REQUEST_FAILED);
p_UBSEC_ubsec_close(fd); p_UBSEC_ubsec_close(fd);
meth = DH_OpenSSL(); meth = DH_OpenSSL();
...@@ -979,7 +979,7 @@ static int ubsec_rand_bytes(unsigned char * buf, ...@@ -979,7 +979,7 @@ static int ubsec_rand_bytes(unsigned char * buf,
if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0) if ((fd = p_UBSEC_ubsec_open(UBSEC_KEY_DEVICE_NAME)) <= 0)
{ {
const RAND_METHOD *meth; const RAND_METHOD *meth;
ENGINEerr(UBSEC_F_UBSEC_INIT, ENGINE_R_UNIT_FAILURE); ENGINEerr(UBSEC_F_UBSEC_INIT, UBSEC_R_UNIT_FAILURE);
num = p_UBSEC_ubsec_bits_to_bytes(num); num = p_UBSEC_ubsec_bits_to_bytes(num);
meth = RAND_SSLeay(); meth = RAND_SSLeay();
meth->seed(buf, num); meth->seed(buf, num);
...@@ -997,7 +997,7 @@ static int ubsec_rand_bytes(unsigned char * buf, ...@@ -997,7 +997,7 @@ static int ubsec_rand_bytes(unsigned char * buf,
/* Hardware's a no go, failover to software */ /* Hardware's a no go, failover to software */
const RAND_METHOD *meth; const RAND_METHOD *meth;
ENGINEerr(UBSEC_F_UBSEC_RNG_BYTES, ENGINE_R_REQUEST_FAILED); ENGINEerr(UBSEC_F_UBSEC_RNG_BYTES, UBSEC_R_REQUEST_FAILED);
p_UBSEC_ubsec_close(fd); p_UBSEC_ubsec_close(fd);
num = p_UBSEC_ubsec_bits_to_bytes(num); num = p_UBSEC_ubsec_bits_to_bytes(num);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或