Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
1b1a6e78
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,发现更多精彩内容 >>
提交
1b1a6e78
编写于
8月 09, 1999
作者:
B
Bodo Möller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
-crlf option.
上级
385be6eb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
6 addition
and
22 deletion
+6
-22
CHANGES
CHANGES
+4
-0
apps/s_client.c
apps/s_client.c
+1
-11
apps/s_server.c
apps/s_server.c
+1
-11
未找到文件。
CHANGES
浏览文件 @
1b1a6e78
...
...
@@ -4,6 +4,10 @@
Changes between 0.9.4 and 0.9.5 [xx XXX 1999]
*) -crlf option to s_client and s_server for sending newlines as
CRLF (as required by many protocols).
[Bodo Moeller]
Changes between 0.9.3a and 0.9.4 [09 Aug 1999]
*) Install libRSAglue.a when OpenSSL is built with RSAref.
...
...
apps/s_client.c
浏览文件 @
1b1a6e78
...
...
@@ -56,9 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifdef APPS_CRLF
# include <assert.h>
#endif
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
...
...
@@ -142,9 +140,7 @@ static void sc_usage(void)
#ifdef FIONBIO
BIO_printf
(
bio_err
,
" -nbio - Run with non-blocking IO
\n
"
);
#endif
#ifdef APPS_CRLF
/* won't be #ifdef'd in next release */
BIO_printf
(
bio_err
,
" -crlf - convert LF from terminal into CRLF
\n
"
);
#endif
BIO_printf
(
bio_err
,
" -quiet - no s_client output
\n
"
);
BIO_printf
(
bio_err
,
" -ssl2 - just use SSLv2
\n
"
);
BIO_printf
(
bio_err
,
" -ssl3 - just use SSLv3
\n
"
);
...
...
@@ -171,9 +167,7 @@ int MAIN(int argc, char **argv)
char
*
cert_file
=
NULL
,
*
key_file
=
NULL
;
char
*
CApath
=
NULL
,
*
CAfile
=
NULL
,
*
cipher
=
NULL
;
int
reconnect
=
0
,
badop
=
0
,
verify
=
SSL_VERIFY_NONE
,
bugs
=
0
;
#ifdef APPS_CRLF
int
crlf
=
0
;
#endif
int
write_tty
,
read_tty
,
write_ssl
,
read_ssl
,
tty_on
,
ssl_pending
;
SSL_CTX
*
ctx
=
NULL
;
int
ret
=
1
,
in_init
=
1
,
i
,
nbio_test
=
0
;
...
...
@@ -244,10 +238,8 @@ int MAIN(int argc, char **argv)
if
(
--
argc
<
1
)
goto
bad
;
cert_file
=
*
(
++
argv
);
}
#ifdef APPS_CRLF
else
if
(
strcmp
(
*
argv
,
"-crlf"
)
==
0
)
crlf
=
1
;
#endif
else
if
(
strcmp
(
*
argv
,
"-quiet"
)
==
0
)
c_quiet
=
1
;
else
if
(
strcmp
(
*
argv
,
"-pause"
)
==
0
)
...
...
@@ -647,7 +639,6 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
#ifndef WINDOWS
else
if
(
FD_ISSET
(
fileno
(
stdin
),
&
readfds
))
{
#ifdef APPS_CRLF
if
(
crlf
)
{
int
j
,
lf_num
;
...
...
@@ -671,7 +662,6 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
assert
(
lf_num
==
0
);
}
else
#endif
i
=
read
(
fileno
(
stdin
),
cbuf
,
BUFSIZZ
);
if
((
!
c_quiet
)
&&
((
i
<=
0
)
||
(
cbuf
[
0
]
==
'Q'
)))
...
...
apps/s_server.c
浏览文件 @
1b1a6e78
...
...
@@ -56,9 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifdef APPS_CRLF
# include <assert.h>
#endif
#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
...
...
@@ -169,9 +167,7 @@ static char *s_dcert_file=NULL,*s_dkey_file=NULL;
static
int
s_nbio
=
0
;
#endif
static
int
s_nbio_test
=
0
;
#ifdef APPS_CRLF
/* won't be #ifdef'd in next release */
int
s_crlf
=
0
;
#endif
static
SSL_CTX
*
ctx
=
NULL
;
static
int
www
=
0
;
...
...
@@ -219,9 +215,7 @@ static void sv_usage(void)
BIO_printf
(
bio_err
,
" -nbio - Run with non-blocking IO
\n
"
);
#endif
BIO_printf
(
bio_err
,
" -nbio_test - test with the non-blocking test bio
\n
"
);
#ifdef APPS_CRLF
BIO_printf
(
bio_err
,
" -crlf - convert LF from terminal into CRLF
\n
"
);
#endif
BIO_printf
(
bio_err
,
" -debug - Print more output
\n
"
);
BIO_printf
(
bio_err
,
" -state - Print the SSL states
\n
"
);
BIO_printf
(
bio_err
,
" -CApath arg - PEM format directory of CA's
\n
"
);
...
...
@@ -525,10 +519,8 @@ int MAIN(int argc, char *argv[])
{
hack
=
1
;
}
else
if
(
strcmp
(
*
argv
,
"-state"
)
==
0
)
{
state
=
1
;
}
#ifdef APPS_CRLF
else
if
(
strcmp
(
*
argv
,
"-crlf"
)
==
0
)
{
s_crlf
=
1
;
}
#endif
else
if
(
strcmp
(
*
argv
,
"-quiet"
)
==
0
)
{
s_quiet
=
1
;
}
else
if
(
strcmp
(
*
argv
,
"-bugs"
)
==
0
)
...
...
@@ -813,7 +805,6 @@ static int sv_body(char *hostname, int s, unsigned char *context)
if
(
i
<=
0
)
continue
;
if
(
FD_ISSET
(
fileno
(
stdin
),
&
readfds
))
{
#ifdef APPS_CRLF
if
(
s_crlf
)
{
int
j
,
lf_num
;
...
...
@@ -837,7 +828,6 @@ static int sv_body(char *hostname, int s, unsigned char *context)
assert
(
lf_num
==
0
);
}
else
#endif
i
=
read
(
fileno
(
stdin
),
buf
,
bufsize
);
if
(
!
s_quiet
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录