Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
75d0ebef
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
1 年多 前同步成功
通知
10
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看板
提交
75d0ebef
编写于
10年前
作者:
R
Rich Salz
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Dead code clean: #if 0 removal in apps
Reviewed-by:
N
Tim Hudson
<
tjh@openssl.org
>
上级
d6fbb194
master
OpenHarmony-2.2-Beta2
OpenHarmony-2.3-Beta
OpenHarmony-3.0-LTS
OpenHarmony-3.1-API8-SDK-Public
OpenHarmony-3.1-API9-SDK-Canary
OpenHarmony-3.1-Beta
OpenHarmony-3.1-Release
OpenHarmony-3.2-Beta1
OpenHarmony-3.2-Beta2
OpenHarmony-3.2-Beta3
OpenHarmony-3.2-Beta4
OpenHarmony-3.2-Beta5
OpenHarmony-3.2-Release
OpenHarmony-4.0-Beta1
OpenHarmony-4.0-Beta2
OpenHarmony-v2.2-Beta
OpenHarmony_1.0.1_release
OpenHarmony_filemanager_develop_20220505
OpenHarmony_filemanager_develop_20220614
add_issus_pr_template_for_master
add_issus_pr_template_for_release
feature_IDL_20220811
master_dy
monthly_20220614
monthly_20220816
monthly_20221018
monthly_20230815
revert-merge-109-master
weekly_20220105
weekly_20220111
weekly_20220118
weekly_20220125
weekly_20220201
weekly_20220208
weekly_20220215
weekly_20220222
weekly_20220301
weekly_20220406
weekly_20220412
weekly_20220419
weekly_20220426
weekly_20220503
weekly_20220510
weekly_20220524
weekly_20220531
weekly_20220607
weekly_20220614
weekly_20220621
weekly_20220628
weekly_20220705
weekly_20220712
weekly_20220719
weekly_20220726
weekly_20220802
weekly_20220809
weekly_20220816
weekly_20220823
weekly_20220830
weekly_20220906
weekly_20220913
weekly_20220920
weekly_20220927
weekly_20221004
weekly_20221011
weekly_20221018
weekly_20221025
weekly_20221101
weekly_20221108
weekly_20221115
weekly_20221122
weekly_20221129
weekly_20221206
weekly_20221213
weekly_20221220
weekly_20221227
weekly_20230103
weekly_20230110
weekly_20230117
weekly_20230124
weekly_20230131
weekly_20230207
weekly_20230214
weekly_20230221
weekly_20230228
weekly_20230307
weekly_20230314
weekly_20230321
weekly_20230328
weekly_20230404
weekly_20230411
weekly_20230418
weekly_20230425
weekly_20230502
weekly_20230509
weekly_20230516
weekly_20230523
weekly_20230530
weekly_20230606
weekly_20230613
weekly_20230619
weekly_20230626
weekly_20230627
weekly_20230704
weekly_20230712
weekly_20230725
weekly_20230801
weekly_20230808
weekly_20230815
weekly_20230822
weekly_20230829
OpenHarmony_v1.1.1-LTS
OpenHarmony_release_v1.1.0
OpenHarmony-v4.0-Beta2
OpenHarmony-v4.0-Beta1
OpenHarmony-v3.2.2-Release
OpenHarmony-v3.2.1-Release
OpenHarmony-v3.2-Release
OpenHarmony-v3.2-Beta5
OpenHarmony-v3.2-Beta4
OpenHarmony-v3.2-Beta3
OpenHarmony-v3.2-Beta2
OpenHarmony-v3.2-Beta1
OpenHarmony-v3.1.7-Release
OpenHarmony-v3.1.6-Release
OpenHarmony-v3.1.5-Release
OpenHarmony-v3.1.4-Release
OpenHarmony-v3.1.3-Release
OpenHarmony-v3.1.2-Release
OpenHarmony-v3.1.1-Release
OpenHarmony-v3.1-Release
OpenHarmony-v3.1-Beta
OpenHarmony-v3.0.8-LTS
OpenHarmony-v3.0.7-LTS
OpenHarmony-v3.0.6-LTS
OpenHarmony-v3.0.5-LTS
OpenHarmony-v3.0.3-LTS
OpenHarmony-v3.0.2-LTS
OpenHarmony-v3.0.1-LTS
OpenHarmony-v3.0-LTS
OpenHarmony-v3.0-Beta1
OpenHarmony-v2.2-Beta2
OpenHarmony-v1.1.5-LTS
OpenHarmony-v1.1.4-LTS
OpenHarmony-v1.1.3-LTS
OpenHarmony-v1.1.2-LTS
OpenHarmony-v1.1.1-LTS
OpenHarmony-2.0-Canary
OpenHarmony-1.0
无相关合并请求
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
1 addition
and
136 deletion
+1
-136
apps/ca.c
apps/ca.c
+0
-12
apps/engine.c
apps/engine.c
+0
-3
apps/openssl.c
apps/openssl.c
+1
-6
apps/s_cb.c
apps/s_cb.c
+0
-4
apps/s_client.c
apps/s_client.c
+0
-25
apps/s_server.c
apps/s_server.c
+0
-49
apps/s_time.c
apps/s_time.c
+0
-16
apps/smime.c
apps/smime.c
+0
-5
apps/speed.c
apps/speed.c
+0
-16
未找到文件。
apps/ca.c
浏览文件 @
75d0ebef
...
...
@@ -2171,18 +2171,6 @@ static void write_new_certificate(BIO *bp, X509 *x, int output_der,
(
void
)
i2d_X509_bio
(
bp
,
x
);
return
;
}
#if 0
/* ??? Not needed since X509_print prints all this stuff anyway */
f = X509_NAME_oneline(X509_get_issuer_name(x), buf, 256);
BIO_printf(bp, "issuer :%s\n", f);
f = X509_NAME_oneline(X509_get_subject_name(x), buf, 256);
BIO_printf(bp, "subject:%s\n", f);
BIO_puts(bp, "serial :");
i2a_ASN1_INTEGER(bp, x->cert_info->serialNumber);
BIO_puts(bp, "\n\n");
#endif
if
(
!
notext
)
X509_print
(
bp
,
x
);
PEM_write_bio_X509
(
bp
,
x
);
...
...
This diff is collapsed.
Click to expand it.
apps/engine.c
浏览文件 @
75d0ebef
...
...
@@ -196,9 +196,6 @@ static int util_verbose(ENGINE *e, int verbose, BIO *bio_out,
if
(
!
ENGINE_ctrl
(
e
,
ENGINE_CTRL_HAS_CTRL_FUNCTION
,
0
,
NULL
,
NULL
)
||
((
num
=
ENGINE_ctrl
(
e
,
ENGINE_CTRL_GET_FIRST_CMD_TYPE
,
0
,
NULL
,
NULL
))
<=
0
))
{
# if 0
BIO_printf
(
bio_out
,
"%s<no control commands>
\n
"
,
indent
);
# endif
return
1
;
}
...
...
This diff is collapsed.
Click to expand it.
apps/openssl.c
浏览文件 @
75d0ebef
...
...
@@ -301,12 +301,7 @@ int main(int Argc, char *ARGV[])
}
CRYPTO_mem_ctrl
(
CRYPTO_MEM_CHECK_ON
);
#if 0
if (getenv("OPENSSL_DEBUG_LOCKING") != NULL)
#endif
{
CRYPTO_set_locking_callback
(
lock_dbg_cb
);
}
CRYPTO_set_locking_callback
(
lock_dbg_cb
);
if
(
getenv
(
"OPENSSL_FIPS"
))
{
#ifdef OPENSSL_FIPS
...
...
This diff is collapsed.
Click to expand it.
apps/s_cb.c
浏览文件 @
75d0ebef
...
...
@@ -812,10 +812,6 @@ void msg_cb(int write_p, int version, int content_type, const void *buf,
BIO_printf
(
bio
,
" "
);
num
=
len
;
#if 0
if (num > 16)
num = 16;
#endif
for
(
i
=
0
;
i
<
num
;
i
++
)
{
if
(
i
%
16
==
0
&&
i
>
0
)
BIO_printf
(
bio
,
"
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
apps/s_client.c
浏览文件 @
75d0ebef
...
...
@@ -1326,10 +1326,6 @@ int MAIN(int argc, char **argv)
if
(
state
)
SSL_CTX_set_info_callback
(
ctx
,
apps_ssl_info_callback
);
#if 0
else
SSL_CTX_set_cipher_list(ctx, getenv("SSL_CIPHER"));
#endif
SSL_CTX_set_verify
(
ctx
,
verify
,
verify_callback
);
...
...
@@ -1508,17 +1504,6 @@ int MAIN(int argc, char **argv)
SSL_set_tlsext_status_type
(
con
,
TLSEXT_STATUSTYPE_ocsp
);
SSL_CTX_set_tlsext_status_cb
(
ctx
,
ocsp_resp_cb
);
SSL_CTX_set_tlsext_status_arg
(
ctx
,
bio_c_out
);
# if 0
{
STACK_OF
(
OCSP_RESPID
)
*
ids
=
sk_OCSP_RESPID_new_null
();
OCSP_RESPID
*
id
=
OCSP_RESPID_new
();
id
->
value
.
byKey
=
ASN1_OCTET_STRING_new
();
id
->
type
=
V_OCSP_RESPID_KEY
;
ASN1_STRING_set
(
id
->
value
.
byKey
,
"Hello World"
,
-
1
);
sk_OCSP_RESPID_push
(
ids
,
id
);
SSL_set_tlsext_status_ids
(
con
,
ids
);
}
# endif
}
#endif
#ifndef OPENSSL_NO_JPAKE
...
...
@@ -1667,16 +1652,6 @@ int MAIN(int argc, char **argv)
tty_on
=
1
;
if
(
in_init
)
{
in_init
=
0
;
#if 0 /* This test doesn't really work as intended
* (needs to be fixed) */
# ifndef OPENSSL_NO_TLSEXT
if (servername != NULL && !SSL_session_reused(con)) {
BIO_printf(bio_c_out,
"Server did %sacknowledge servername extension.\n",
tlsextcbp.ack ? "" : "not ");
}
# endif
#endif
if
(
sess_out
)
{
BIO
*
stmp
=
BIO_new_file
(
sess_out
,
"w"
);
if
(
stmp
)
{
...
...
This diff is collapsed.
Click to expand it.
apps/s_server.c
浏览文件 @
75d0ebef
...
...
@@ -838,12 +838,6 @@ static int cert_status_cb(SSL *s, void *arg)
STACK_OF
(
X509_EXTENSION
)
*
exts
;
int
ret
=
SSL_TLSEXT_ERR_NOACK
;
int
i
;
# if 0
STACK_OF
(
OCSP_RESPID
)
*
ids
;
SSL_get_tlsext_status_ids
(
s
,
&
ids
);
BIO_printf
(
err
,
"cert_status: received %d ids
\n
"
,
sk_OCSP_RESPID_num
(
ids
));
# endif
if
(
srctx
->
verbose
)
BIO_puts
(
err
,
"cert_status: callback called
\n
"
);
/* Build up OCSP query from server certificate */
...
...
@@ -1735,19 +1729,6 @@ int MAIN(int argc, char *argv[])
SSL_CTX_set_tlsext_use_srtp
(
ctx
,
srtp_profiles
);
#endif
#if 0
if (cipher == NULL)
cipher = getenv("SSL_CIPHER");
#endif
#if 0
if (s_cert_file == NULL) {
BIO_printf(bio_err,
"You must specify a certificate file for the server to use\n");
goto end;
}
#endif
if
((
!
SSL_CTX_load_verify_locations
(
ctx
,
CAfile
,
CApath
))
||
(
!
SSL_CTX_set_default_verify_paths
(
ctx
)))
{
/* BIO_printf(bio_err,"X509_load_verify_locations\n"); */
...
...
@@ -2691,27 +2672,6 @@ static DH *load_dh_param(const char *dhfile)
}
#endif
#if 0
static int load_CA(SSL_CTX *ctx, char *file)
{
FILE *in;
X509 *x = NULL;
if ((in = fopen(file, "r")) == NULL)
return (0);
for (;;) {
if (PEM_read_X509(in, &x, NULL) == NULL)
break;
SSL_CTX_add_client_CA(ctx, x);
}
if (x != NULL)
X509_free(x);
fclose(in);
return (1);
}
#endif
static
int
www_body
(
char
*
hostname
,
int
s
,
int
stype
,
unsigned
char
*
context
)
{
char
*
buf
=
NULL
;
...
...
@@ -3010,21 +2970,12 @@ static int www_body(char *hostname, int s, int stype, unsigned char *context)
BIO_printf
(
io
,
"'%s' is an invalid path
\r\n
"
,
p
);
break
;
}
#if 0
/* append if a directory lookup */
if (e[-1] == '/')
strcat(p, "index.html");
#endif
/* if a directory, do the index thang */
if
(
app_isdir
(
p
)
>
0
)
{
#if 0 /* must check buffer size */
strcat(p, "/index.html");
#else
BIO_puts
(
io
,
text
);
BIO_printf
(
io
,
"'%s' is a directory
\r\n
"
,
p
);
break
;
#endif
}
if
((
file
=
BIO_new_file
(
p
,
"r"
))
==
NULL
)
{
...
...
This diff is collapsed.
Click to expand it.
apps/s_time.c
浏览文件 @
75d0ebef
...
...
@@ -217,17 +217,6 @@ static int parseArgs(int argc, char **argv)
goto
bad
;
host
=
*
(
++
argv
);
}
#if 0
else if (strcmp(*argv, "-host") == 0) {
if (--argc < 1)
goto bad;
host = *(++argv);
} else if (strcmp(*argv, "-port") == 0) {
if (--argc < 1)
goto bad;
port = *(++argv);
}
#endif
else
if
(
strcmp
(
*
argv
,
"-reuse"
)
==
0
)
perform
=
2
;
else
if
(
strcmp
(
*
argv
,
"-new"
)
==
0
)
...
...
@@ -582,11 +571,6 @@ static SSL *doConnection(SSL *scon)
SSL_set_bio
(
serverCon
,
conn
,
conn
);
#if 0
if (scon != NULL)
SSL_set_session(serverCon, SSL_get_session(scon));
#endif
/* ok, lets connect */
for
(;;)
{
i
=
SSL_connect
(
serverCon
);
...
...
This diff is collapsed.
Click to expand it.
apps/smime.c
浏览文件 @
75d0ebef
...
...
@@ -511,11 +511,6 @@ int MAIN(int argc, char **argv)
while
(
*
args
)
{
if
(
!
(
cert
=
load_cert
(
bio_err
,
*
args
,
FORMAT_PEM
,
NULL
,
e
,
"recipient certificate file"
)))
{
#if 0 /* An appropriate message is already printed */
BIO_printf(bio_err,
"Can't read recipient certificate file %s\n",
*args);
#endif
goto
end
;
}
sk_X509_push
(
encerts
,
cert
);
...
...
This diff is collapsed.
Click to expand it.
apps/speed.c
浏览文件 @
75d0ebef
...
...
@@ -874,12 +874,6 @@ int MAIN(int argc, char **argv)
else
#endif
#ifndef OPENSSL_NO_RSA
# if 0
/* was: #ifdef RSAref */
if
(
strcmp
(
*
argv
,
"rsaref"
)
==
0
)
{
RSA_set_default_openssl_method
(
RSA_PKCS1_RSAref
());
j
--
;
}
else
# endif
# ifndef RSA_NULL
if
(
strcmp
(
*
argv
,
"openssl"
)
==
0
)
{
RSA_set_default_method
(
RSA_PKCS1_SSLeay
());
...
...
@@ -1273,16 +1267,6 @@ int MAIN(int argc, char **argv)
i
);
goto
end
;
}
# if 0
else
{
BIO_printf
(
bio_err
,
mr
?
"+RK:%d:"
:
"Loaded RSA key, %d bit modulus and e= 0x"
,
BN_num_bits
(
rsa_key
[
i
]
->
n
));
BN_print
(
bio_err
,
rsa_key
[
i
]
->
e
);
BIO_printf
(
bio_err
,
"
\n
"
);
}
# endif
}
#endif
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部