Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
690ecff7
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
大约 1 年 前同步成功
通知
9
Star
18
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
690ecff7
编写于
3月 14, 2002
作者:
B
Bodo Möller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes for 'no-hw' combined with 'no-SOME_CIPHER'.
Fix dsaparam usage output. Submitted by: Nils Larsch
上级
234c7376
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
33 addition
and
28 deletion
+33
-28
apps/apps.c
apps/apps.c
+4
-4
apps/dsaparam.c
apps/dsaparam.c
+1
-0
apps/pkcs8.c
apps/pkcs8.c
+1
-1
apps/speed.c
apps/speed.c
+1
-2
crypto/asn1/x_pubkey.c
crypto/asn1/x_pubkey.c
+3
-1
crypto/ecdsa/ecdsatest.c
crypto/ecdsa/ecdsatest.c
+8
-7
crypto/engine/engine.h
crypto/engine/engine.h
+1
-1
crypto/engine/hw_4758_cca.c
crypto/engine/hw_4758_cca.c
+4
-4
crypto/engine/hw_sureware.c
crypto/engine/hw_sureware.c
+4
-4
crypto/evp/evp_pkey.c
crypto/evp/evp_pkey.c
+6
-4
未找到文件。
apps/apps.c
浏览文件 @
690ecff7
...
...
@@ -147,7 +147,7 @@ static UI_METHOD *ui_method = NULL;
static
int
set_table_opts
(
unsigned
long
*
flags
,
const
char
*
arg
,
const
NAME_EX_TBL
*
in_tbl
);
static
int
set_multi_opts
(
unsigned
long
*
flags
,
const
char
*
arg
,
const
NAME_EX_TBL
*
in_tbl
);
#if
ndef OPENSSL_NO_RC4
#if
!defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
/* Looks like this stuff is worth moving into separate function */
static
EVP_PKEY
*
load_netscape_key
(
BIO
*
err
,
BIO
*
key
,
const
char
*
file
,
...
...
@@ -832,7 +832,7 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format,
pkey
=
PEM_read_bio_PrivateKey
(
key
,
NULL
,
(
pem_password_cb
*
)
password_callback
,
&
cb_data
);
}
#if
ndef OPENSSL_NO_RC4
#if
!defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
else
if
(
format
==
FORMAT_NETSCAPE
||
format
==
FORMAT_IISSGC
)
pkey
=
load_netscape_key
(
err
,
key
,
file
,
key_descrip
,
format
);
#endif
...
...
@@ -901,7 +901,7 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format,
pkey
=
PEM_read_bio_PUBKEY
(
key
,
NULL
,
(
pem_password_cb
*
)
password_callback
,
&
cb_data
);
}
#if
ndef OPENSSL_NO_RC4
#if
!defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
else
if
(
format
==
FORMAT_NETSCAPE
||
format
==
FORMAT_IISSGC
)
pkey
=
load_netscape_key
(
err
,
key
,
file
,
key_descrip
,
format
);
#endif
...
...
@@ -917,7 +917,7 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format,
return
(
pkey
);
}
#if
ndef OPENSSL_NO_RC4
#if
!defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
EVP_PKEY
*
load_netscape_key
(
BIO
*
err
,
BIO
*
key
,
const
char
*
file
,
const
char
*
key_descrip
,
int
format
)
...
...
apps/dsaparam.c
浏览文件 @
690ecff7
...
...
@@ -189,6 +189,7 @@ bad:
BIO_printf
(
bio_err
,
" -text print the key in text
\n
"
);
BIO_printf
(
bio_err
,
" -C Output C code
\n
"
);
BIO_printf
(
bio_err
,
" -noout no output
\n
"
);
BIO_printf
(
bio_err
,
" -genkey generate a DSA key
\n
"
);
BIO_printf
(
bio_err
,
" -rand files to use for random number input
\n
"
);
BIO_printf
(
bio_err
,
" -engine e use engine e, possibly a hardware device.
\n
"
);
BIO_printf
(
bio_err
,
" number number of bits to use for generating private key
\n
"
);
...
...
apps/pkcs8.c
浏览文件 @
690ecff7
...
...
@@ -83,7 +83,7 @@ int MAIN(int argc, char **argv)
int
nocrypt
=
0
;
X509_SIG
*
p8
;
PKCS8_PRIV_KEY_INFO
*
p8inf
;
EVP_PKEY
*
pkey
;
EVP_PKEY
*
pkey
=
NULL
;
char
pass
[
50
],
*
passin
=
NULL
,
*
passout
=
NULL
,
*
p8pass
=
NULL
;
int
badarg
=
0
;
char
*
engine
=
NULL
;
...
...
apps/speed.c
浏览文件 @
690ecff7
...
...
@@ -372,11 +372,10 @@ int MAIN(int argc, char **argv)
ENGINE
*
e
=
NULL
;
unsigned
char
*
buf
=
NULL
,
*
buf2
=
NULL
;
int
mret
=
1
;
long
count
=
0
,
save_count
=
0
;
long
count
=
0
,
save_count
=
0
,
rsa_count
;
int
i
,
j
,
k
;
#ifndef OPENSSL_NO_RSA
unsigned
rsa_num
;
long
rsa_count
;
#endif
unsigned
char
md
[
EVP_MAX_MD_SIZE
];
#ifndef OPENSSL_NO_MD2
...
...
crypto/asn1/x_pubkey.c
浏览文件 @
690ecff7
...
...
@@ -212,7 +212,7 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
long
j
;
int
type
;
unsigned
char
*
p
;
#if
ndef OPENSSL_NO_DSA
#if
!defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA)
const
unsigned
char
*
cp
;
X509_ALGOR
*
a
;
#endif
...
...
@@ -237,7 +237,9 @@ EVP_PKEY *X509_PUBKEY_get(X509_PUBKEY *key)
/* the parameters must be extracted before the public key (ECDSA!) */
#if !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA)
a
=
key
->
algor
;
#endif
if
(
0
)
;
...
...
crypto/ecdsa/ecdsatest.c
浏览文件 @
690ecff7
...
...
@@ -56,13 +56,6 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <openssl/crypto.h>
#include <openssl/bio.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/ecdsa.h>
#include <openssl/engine.h>
#include <openssl/err.h>
#ifdef CLOCKS_PER_SEC
/* "To determine the time in seconds, the value returned
...
...
@@ -81,6 +74,14 @@
int
main
(
int
argc
,
char
*
argv
[])
{
puts
(
"Elliptic curves are disabled."
);
return
0
;
}
#else
#include <openssl/crypto.h>
#include <openssl/bio.h>
#include <openssl/evp.h>
#include <openssl/x509.h>
#include <openssl/ecdsa.h>
#include <openssl/engine.h>
#include <openssl/err.h>
static
BIO
*
bio_err
=
NULL
;
static
const
char
rnd_seed
[]
=
"string to make the random number generator think it has entropy"
;
...
...
crypto/engine/engine.h
浏览文件 @
690ecff7
...
...
@@ -92,7 +92,7 @@ typedef void DSA_METHOD;
#ifdef OPENSSL_NO_DH
typedef
void
DH_METHOD
;
#endif
#ifdef OPENSS_NO_ECDSA
#ifdef OPENSS
L
_NO_ECDSA
typedef
void
ECDSA_METHOD
;
#endif
...
...
crypto/engine/hw_4758_cca.c
浏览文件 @
690ecff7
...
...
@@ -62,8 +62,8 @@
#include <openssl/objects.h>
#include <openssl/engine.h>
#ifndef NO_HW
#ifndef NO_HW_4758_CCA
#ifndef
OPENSSL_
NO_HW
#ifndef
OPENSSL_
NO_HW_4758_CCA
#ifdef FLAT_INC
#include "hw_4758_cca.h"
...
...
@@ -946,5 +946,5 @@ IMPLEMENT_DYNAMIC_CHECK_FN()
IMPLEMENT_DYNAMIC_BIND_FN
(
bind_fn
)
#endif
/* ENGINE_DYNAMIC_SUPPORT */
#endif
/* !NO_HW_4758_CCA */
#endif
/* !NO_HW */
#endif
/* !
OPENSSL_
NO_HW_4758_CCA */
#endif
/* !
OPENSSL_
NO_HW */
crypto/engine/hw_sureware.c
浏览文件 @
690ecff7
...
...
@@ -59,8 +59,8 @@
#include "engine.h"
#include <openssl/engine.h>
#ifndef NO_HW
#ifndef NO_HW_SUREWARE
#ifndef
OPENSSL_
NO_HW
#ifndef
OPENSSL_
NO_HW_SUREWARE
#ifdef FLAT_INC
#include "sureware.h"
...
...
@@ -962,5 +962,5 @@ static int surewarehk_modexp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
}
return
ret
;
}
#endif
/* !NO_HW_SureWare */
#endif
/* !NO_HW */
#endif
/* !
OPENSSL_
NO_HW_SureWare */
#endif
/* !
OPENSSL_
NO_HW */
crypto/evp/evp_pkey.c
浏览文件 @
690ecff7
...
...
@@ -83,7 +83,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
#ifndef OPENSSL_NO_ECDSA
ECDSA
*
ecdsa
=
NULL
;
#endif
#if !defined(OPENSSL_NO_DSA)
&&
!defined(OPENSSL_NO_ECDSA)
#if !defined(OPENSSL_NO_DSA)
||
!defined(OPENSSL_NO_ECDSA)
ASN1_INTEGER
*
privkey
;
ASN1_TYPE
*
t1
,
*
t2
,
*
param
=
NULL
;
STACK_OF
(
ASN1_TYPE
)
*
n_stack
=
NULL
;
...
...
@@ -92,9 +92,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
#endif
X509_ALGOR
*
a
;
unsigned
char
*
p
;
#ifndef OPENSSL_NO_RSA
const
unsigned
char
*
cp
;
#endif
int
pkeylen
;
int
nid
;
char
obj_tmp
[
80
];
...
...
@@ -126,7 +124,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
EVP_PKEY_assign_RSA
(
pkey
,
rsa
);
break
;
#endif
#if !defined(OPENSSL_NO_DSA)
&&
!defined(OPENSSL_NO_ECDSA)
#if !defined(OPENSSL_NO_DSA)
||
!defined(OPENSSL_NO_ECDSA)
case
NID_ecdsa_with_SHA1
:
case
NID_dsa
:
/* PKCS#8 DSA/ECDSA is weird: you just get a private key integer
...
...
@@ -279,8 +277,12 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
err:
if
(
ctx
)
BN_CTX_free
(
ctx
);
sk_ASN1_TYPE_pop_free
(
n_stack
,
ASN1_TYPE_free
);
#ifndef OPENSSL_NO_DSA
if
(
dsa
)
DSA_free
(
dsa
);
#endif
#ifndef OPENSSL_NO_ECDSA
if
(
ecdsa
)
ECDSA_free
(
ecdsa
);
#endif
if
(
pkey
)
EVP_PKEY_free
(
pkey
);
return
NULL
;
break
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录