Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
cc7399e7
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
8 个月 前同步成功
通知
8
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,体验更适合开发者的 AI 搜索 >>
提交
cc7399e7
编写于
4月 07, 2009
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Changes from 1.0.0-stable.
上级
14b3f100
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
88 addition
and
15 deletion
+88
-15
CHANGES
CHANGES
+3
-0
Configure
Configure
+8
-1
Makefile.org
Makefile.org
+1
-0
crypto/Makefile
crypto/Makefile
+2
-2
crypto/objects/objxref.pl
crypto/objects/objxref.pl
+5
-2
crypto/rand/rand_unix.c
crypto/rand/rand_unix.c
+44
-1
doc/crypto/d2i_RSAPublicKey.pod
doc/crypto/d2i_RSAPublicKey.pod
+4
-4
ssl/s3_lib.c
ssl/s3_lib.c
+16
-1
ssl/s3_pkt.c
ssl/s3_pkt.c
+4
-3
ssl/ssl_locl.h
ssl/ssl_locl.h
+1
-1
未找到文件。
CHANGES
浏览文件 @
cc7399e7
...
...
@@ -772,6 +772,9 @@
Changes between 0.9.8k and 0.9.8l [xx XXX xxxx]
*) Handle non-blocking I/O properly in SSL_shutdown() call.
[Darryl Miles <darryl-mailinglists@netbauds.net>]
*) Add 2.5.4.* OIDs
[Ilya O. <vrghost@gmail.com>]
...
...
Configure
浏览文件 @
cc7399e7
...
...
@@ -1218,7 +1218,14 @@ if ($zlib)
$cflags = "-DZLIB $cflags";
if (defined($disabled{"zlib-dynamic"}))
{
$lflags = "$lflags -lz";
if (defined($withargs{"zlib-lib"}))
{
$lflags = "$lflags -L" . $withargs{"zlib-lib"} . " -lz";
}
else
{
$lflags = "$lflags -lz";
}
}
else
{
...
...
Makefile.org
浏览文件 @
cc7399e7
...
...
@@ -188,6 +188,7 @@ BUILDENV= PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \
MAKEDEPPROG
=
'
$(MAKEDEPPROG)
'
\
SHARED_LDFLAGS
=
'
$(SHARED_LDFLAGS)
'
\
KRB5_INCLUDES
=
'
$(KRB5_INCLUDES)
'
LIBKRB5
=
'
$(LIBKRB5)
'
\
ZLIB_INCLUDE
=
'
$(ZLIB_INCLUDE)
'
LIBZLIB
=
'
$(LIBZLIB)
'
\
EXE_EXT
=
'
$(EXE_EXT)
'
SHARED_LIBS
=
'
$(SHARED_LIBS)
'
\
SHLIB_EXT
=
'
$(SHLIB_EXT)
'
SHLIB_TARGET
=
'
$(SHLIB_TARGET)
'
\
PEX_LIBS
=
'
$(PEX_LIBS)
'
EX_LIBS
=
'
$(EX_LIBS)
'
\
...
...
crypto/Makefile
浏览文件 @
cc7399e7
...
...
@@ -5,9 +5,9 @@
DIR
=
crypto
TOP
=
..
CC
=
cc
INCLUDE
=
-I
.
-I
$(TOP)
-I
../include
INCLUDE
=
-I
.
-I
$(TOP)
-I
../include
$(ZLIB_INCLUDE)
# INCLUDES targets sudbirs!
INCLUDES
=
-I
..
-I
../..
-I
../asn1
-I
../evp
-I
../../include
INCLUDES
=
-I
..
-I
../..
-I
../asn1
-I
../evp
-I
../../include
$(ZLIB_INCLUDE)
CFLAG
=
-g
MAKEDEPPROG
=
makedepend
MAKEDEPEND
=
$(TOP)
/util/domd
$(TOP)
-MD
$(MAKEDEPPROG)
...
...
crypto/objects/objxref.pl
浏览文件 @
cc7399e7
...
...
@@ -54,10 +54,13 @@ my @srt2 = sort
return
$ap2
-
$bp2
;
}
@xrkeys
;
my
$pname
=
$
0
;
$pname
=~
s|^.[^/]/||
;
print
<<EOF;
/* AUTOGENERATED BY $
0
, DO NOT EDIT */
/* AUTOGENERATED BY $
pname
, DO NOT EDIT */
typedef struct
{
...
...
crypto/rand/rand_unix.c
浏览文件 @
cc7399e7
...
...
@@ -133,7 +133,50 @@
# define FD_SETSIZE (8*sizeof(fd_set))
#endif
#ifdef __OpenBSD__
#ifdef __VOS__
int
RAND_poll
(
void
)
{
unsigned
char
buf
[
ENTROPY_NEEDED
];
pid_t
curr_pid
;
uid_t
curr_uid
;
static
int
first
=
1
;
int
i
;
long
rnd
=
0
;
struct
timespec
ts
;
unsigned
seed
;
/* The VOS random() function starts from a static seed so its
initial value is predictable. If random() returns the
initial value, reseed it with dynamic data. The VOS
real-time clock has a granularity of 1 nsec so it should be
reasonably difficult to predict its exact value. Do not
gratuitously reseed the PRNG because other code in this
process or thread may be using it. */
if
(
first
)
{
first
=
0
;
rnd
=
random
();
if
(
rnd
==
1804289383
)
{
clock_gettime
(
CLOCK_REALTIME
,
&
ts
);
curr_pid
=
getpid
();
curr_uid
=
getuid
();
seed
=
ts
.
tv_sec
^
ts
.
tv_nsec
^
curr_pid
^
curr_uid
;
srandom
(
seed
);
}
}
for
(
i
=
0
;
i
<
sizeof
(
buf
);
i
++
)
{
if
(
i
%
4
==
0
)
rnd
=
random
();
buf
[
i
]
=
rnd
;
rnd
>>=
8
;
}
RAND_add
(
buf
,
sizeof
(
buf
),
ENTROPY_NEEDED
);
memset
(
buf
,
0
,
sizeof
(
buf
));
return
1
;
}
#elif defined __OpenBSD__
int
RAND_poll
(
void
)
{
u_int32_t
rnd
=
0
,
i
;
...
...
doc/crypto/d2i_RSAPublicKey.pod
浏览文件 @
cc7399e7
...
...
@@ -11,21 +11,21 @@ d2i_Netscape_RSA - RSA public and private key encoding functions.
#include <openssl/rsa.h>
#include <openssl/x509.h>
RSA * d2i_RSAPublicKey(RSA **a, unsigned char **pp, long length);
RSA * d2i_RSAPublicKey(RSA **a,
const
unsigned char **pp, long length);
int i2d_RSAPublicKey(RSA *a, unsigned char **pp);
RSA * d2i_RSA_PUBKEY(RSA **a, unsigned char **pp, long length);
RSA * d2i_RSA_PUBKEY(RSA **a,
const
unsigned char **pp, long length);
int i2d_RSA_PUBKEY(RSA *a, unsigned char **pp);
RSA * d2i_RSAPrivateKey(RSA **a, unsigned char **pp, long length);
RSA * d2i_RSAPrivateKey(RSA **a,
const
unsigned char **pp, long length);
int i2d_RSAPrivateKey(RSA *a, unsigned char **pp);
int i2d_Netscape_RSA(RSA *a, unsigned char **pp, int (*cb)());
RSA * d2i_Netscape_RSA(RSA **a, unsigned char **pp, long length, int (*cb)());
RSA * d2i_Netscape_RSA(RSA **a,
const
unsigned char **pp, long length, int (*cb)());
=head1 DESCRIPTION
...
...
ssl/s3_lib.c
浏览文件 @
cc7399e7
...
...
@@ -3138,6 +3138,7 @@ int ssl3_get_req_cert_type(SSL *s, unsigned char *p)
int
ssl3_shutdown
(
SSL
*
s
)
{
int
ret
;
/* Don't do anything much if we have not done the handshake or
* we don't want to send messages :-) */
...
...
@@ -3155,18 +3156,32 @@ int ssl3_shutdown(SSL *s)
#endif
/* our shutdown alert has been sent now, and if it still needs
* to be written, s->s3->alert_dispatch will be true */
if
(
s
->
s3
->
alert_dispatch
)
return
(
-
1
);
/* return WANT_WRITE */
}
else
if
(
s
->
s3
->
alert_dispatch
)
{
/* resend it if not sent */
#if 1
s
->
method
->
ssl_dispatch_alert
(
s
);
ret
=
s
->
method
->
ssl_dispatch_alert
(
s
);
if
(
ret
==
-
1
)
{
/* we only get to return -1 here the 2nd/Nth
* invocation, we must have already signalled
* return 0 upon a previous invoation,
* return WANT_WRITE */
return
(
ret
);
}
#endif
}
else
if
(
!
(
s
->
shutdown
&
SSL_RECEIVED_SHUTDOWN
))
{
/* If we are waiting for a close from our peer, we are closed */
s
->
method
->
ssl_read_bytes
(
s
,
0
,
NULL
,
0
,
0
);
if
(
!
(
s
->
shutdown
&
SSL_RECEIVED_SHUTDOWN
))
{
return
(
-
1
);
/* return WANT_READ */
}
}
if
((
s
->
shutdown
==
(
SSL_SENT_SHUTDOWN
|
SSL_RECEIVED_SHUTDOWN
))
&&
...
...
ssl/s3_pkt.c
浏览文件 @
cc7399e7
...
...
@@ -1350,13 +1350,13 @@ int ssl3_do_change_cipher_spec(SSL *s)
return
(
1
);
}
void
ssl3_send_alert
(
SSL
*
s
,
int
level
,
int
desc
)
int
ssl3_send_alert
(
SSL
*
s
,
int
level
,
int
desc
)
{
/* Map tls/ssl alert value to correct one */
desc
=
s
->
method
->
ssl3_enc
->
alert_value
(
desc
);
if
(
s
->
version
==
SSL3_VERSION
&&
desc
==
SSL_AD_PROTOCOL_VERSION
)
desc
=
SSL_AD_HANDSHAKE_FAILURE
;
/* SSL 3.0 does not have protocol_version alerts */
if
(
desc
<
0
)
return
;
if
(
desc
<
0
)
return
-
1
;
/* If a fatal one, remove from cache */
if
((
level
==
2
)
&&
(
s
->
session
!=
NULL
))
SSL_CTX_remove_session
(
s
->
ctx
,
s
->
session
);
...
...
@@ -1365,9 +1365,10 @@ void ssl3_send_alert(SSL *s, int level, int desc)
s
->
s3
->
send_alert
[
0
]
=
level
;
s
->
s3
->
send_alert
[
1
]
=
desc
;
if
(
s
->
s3
->
wbuf
.
left
==
0
)
/* data still being written out? */
s
->
method
->
ssl_dispatch_alert
(
s
);
return
s
->
method
->
ssl_dispatch_alert
(
s
);
/* else data is still being written out, we will get written
* some time in the future */
return
-
1
;
}
int
ssl3_dispatch_alert
(
SSL
*
s
)
...
...
ssl/ssl_locl.h
浏览文件 @
cc7399e7
...
...
@@ -857,7 +857,7 @@ int ssl3_send_change_cipher_spec(SSL *s,int state_a,int state_b);
int
ssl3_change_cipher_state
(
SSL
*
s
,
int
which
);
void
ssl3_cleanup_key_block
(
SSL
*
s
);
int
ssl3_do_write
(
SSL
*
s
,
int
type
);
void
ssl3_send_alert
(
SSL
*
s
,
int
level
,
int
desc
);
int
ssl3_send_alert
(
SSL
*
s
,
int
level
,
int
desc
);
int
ssl3_generate_master_secret
(
SSL
*
s
,
unsigned
char
*
out
,
unsigned
char
*
p
,
int
len
);
int
ssl3_get_req_cert_type
(
SSL
*
s
,
unsigned
char
*
p
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录