Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
4b87706d
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
接近 2 年 前同步成功
通知
12
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看板
提交
4b87706d
编写于
11月 18, 2014
作者:
M
Matt Caswell
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Delete unused file
Reviewed-by:
N
Richard Levitte
<
levitte@openssl.org
>
上级
fe78f08d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
283 deletion
+2
-283
ssl/Makefile
ssl/Makefile
+2
-23
ssl/d1_enc.c
ssl/d1_enc.c
+0
-260
未找到文件。
ssl/Makefile
浏览文件 @
4b87706d
...
@@ -26,7 +26,7 @@ LIBSRC= \
...
@@ -26,7 +26,7 @@ LIBSRC= \
s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c
\
s23_meth.c s23_srvr.c s23_clnt.c s23_lib.c s23_pkt.c
\
t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c t1_ext.c
\
t1_meth.c t1_srvr.c t1_clnt.c t1_lib.c t1_enc.c t1_ext.c
\
d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c
\
d1_meth.c d1_srvr.c d1_clnt.c d1_lib.c d1_pkt.c
\
d1_both.c d1_
enc.c d1_
srtp.c
\
d1_both.c d1_srtp.c
\
ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c
\
ssl_lib.c ssl_err2.c ssl_cert.c ssl_sess.c
\
ssl_ciph.c ssl_stat.c ssl_rsa.c
\
ssl_ciph.c ssl_stat.c ssl_rsa.c
\
ssl_asn1.c ssl_txt.c ssl_algs.c ssl_conf.c
\
ssl_asn1.c ssl_txt.c ssl_algs.c ssl_conf.c
\
...
@@ -37,7 +37,7 @@ LIBOBJ= \
...
@@ -37,7 +37,7 @@ LIBOBJ= \
s23_meth.o s23_srvr.o s23_clnt.o s23_lib.o s23_pkt.o
\
s23_meth.o s23_srvr.o s23_clnt.o s23_lib.o s23_pkt.o
\
t1_meth.o t1_srvr.o t1_clnt.o t1_lib.o t1_enc.o t1_ext.o
\
t1_meth.o t1_srvr.o t1_clnt.o t1_lib.o t1_enc.o t1_ext.o
\
d1_meth.o d1_srvr.o d1_clnt.o d1_lib.o d1_pkt.o
\
d1_meth.o d1_srvr.o d1_clnt.o d1_lib.o d1_pkt.o
\
d1_both.o d1_
enc.o d1_
srtp.o
\
d1_both.o d1_srtp.o
\
ssl_lib.o ssl_err2.o ssl_cert.o ssl_sess.o
\
ssl_lib.o ssl_err2.o ssl_cert.o ssl_sess.o
\
ssl_ciph.o ssl_stat.o ssl_rsa.o
\
ssl_ciph.o ssl_stat.o ssl_rsa.o
\
ssl_asn1.o ssl_txt.o ssl_algs.o ssl_conf.o
\
ssl_asn1.o ssl_txt.o ssl_algs.o ssl_conf.o
\
...
@@ -165,27 +165,6 @@ d1_clnt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
...
@@ -165,27 +165,6 @@ d1_clnt.o: ../include/openssl/ssl3.h ../include/openssl/stack.h
d1_clnt.o
:
../include/openssl/symhacks.h ../include/openssl/tls1.h
d1_clnt.o
:
../include/openssl/symhacks.h ../include/openssl/tls1.h
d1_clnt.o
:
../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_clnt.c
d1_clnt.o
:
../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_clnt.c
d1_clnt.o
:
kssl_lcl.h ssl_locl.h
d1_clnt.o
:
kssl_lcl.h ssl_locl.h
d1_enc.o
:
../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
d1_enc.o
:
../include/openssl/buffer.h ../include/openssl/comp.h
d1_enc.o
:
../include/openssl/crypto.h ../include/openssl/dsa.h
d1_enc.o
:
../include/openssl/dtls1.h ../include/openssl/e_os2.h
d1_enc.o
:
../include/openssl/ec.h ../include/openssl/ecdh.h
d1_enc.o
:
../include/openssl/ecdsa.h ../include/openssl/err.h
d1_enc.o
:
../include/openssl/evp.h ../include/openssl/hmac.h
d1_enc.o
:
../include/openssl/kssl.h ../include/openssl/lhash.h
d1_enc.o
:
../include/openssl/md5.h ../include/openssl/obj_mac.h
d1_enc.o
:
../include/openssl/objects.h ../include/openssl/opensslconf.h
d1_enc.o
:
../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
d1_enc.o
:
../include/openssl/pem.h ../include/openssl/pem2.h
d1_enc.o
:
../include/openssl/pkcs7.h ../include/openssl/pqueue.h
d1_enc.o
:
../include/openssl/rand.h ../include/openssl/rsa.h
d1_enc.o
:
../include/openssl/safestack.h ../include/openssl/sha.h
d1_enc.o
:
../include/openssl/srtp.h ../include/openssl/ssl.h
d1_enc.o
:
../include/openssl/ssl2.h ../include/openssl/ssl23.h
d1_enc.o
:
../include/openssl/ssl3.h ../include/openssl/stack.h
d1_enc.o
:
../include/openssl/symhacks.h ../include/openssl/tls1.h
d1_enc.o
:
../include/openssl/x509.h ../include/openssl/x509_vfy.h d1_enc.c
d1_enc.o
:
ssl_locl.h
d1_lib.o
:
../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
d1_lib.o
:
../e_os.h ../include/openssl/asn1.h ../include/openssl/bio.h
d1_lib.o
:
../include/openssl/buffer.h ../include/openssl/comp.h
d1_lib.o
:
../include/openssl/buffer.h ../include/openssl/comp.h
d1_lib.o
:
../include/openssl/crypto.h ../include/openssl/dsa.h
d1_lib.o
:
../include/openssl/crypto.h ../include/openssl/dsa.h
...
...
ssl/d1_enc.c
已删除
100644 → 0
浏览文件 @
fe78f08d
/* ssl/d1_enc.c */
/*
* DTLS implementation written by Nagendra Modadugu
* (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
*/
/* ====================================================================
* Copyright (c) 1998-2005 The OpenSSL Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. All advertising materials mentioning features or use of this
* software must display the following acknowledgment:
* "This product includes software developed by the OpenSSL Project
* for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
*
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
* endorse or promote products derived from this software without
* prior written permission. For written permission, please contact
* openssl-core@openssl.org.
*
* 5. Products derived from this software may not be called "OpenSSL"
* nor may "OpenSSL" appear in their names without prior written
* permission of the OpenSSL Project.
*
* 6. Redistributions of any form whatsoever must retain the following
* acknowledgment:
* "This product includes software developed by the OpenSSL Project
* for use in the OpenSSL Toolkit (http://www.openssl.org/)"
*
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
* ====================================================================
*
* This product includes cryptographic software written by Eric Young
* (eay@cryptsoft.com). This product includes software written by Tim
* Hudson (tjh@cryptsoft.com).
*
*/
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
* by Eric Young (eay@cryptsoft.com).
* The implementation was written so as to conform with Netscapes SSL.
*
* This library is free for commercial and non-commercial use as long as
* the following conditions are aheared to. The following conditions
* apply to all code found in this distribution, be it the RC4, RSA,
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
* included with this distribution is covered by the same copyright terms
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
*
* Copyright remains Eric Young's, and as such any Copyright notices in
* the code are not to be removed.
* If this package is used in a product, Eric Young should be given attribution
* as the author of the parts of the library used.
* This can be in the form of a textual message at program startup or
* in documentation (online or textual) provided with the package.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* "This product includes cryptographic software written by
* Eric Young (eay@cryptsoft.com)"
* The word 'cryptographic' can be left out if the rouines from the library
* being used are not cryptographic related :-).
* 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
*
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* The licence and distribution terms for any publically available version or
* derivative of this code cannot be changed. i.e. this code cannot simply be
* copied and put under another distribution licence
* [including the GNU Public Licence.]
*/
#include <stdio.h>
#include "ssl_locl.h"
#ifndef OPENSSL_NO_COMP
#include <openssl/comp.h>
#endif
#include <openssl/evp.h>
#include <openssl/hmac.h>
#include <openssl/md5.h>
#include <openssl/rand.h>
#ifdef KSSL_DEBUG
#include <openssl/des.h>
#endif
/* dtls1_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively.
*
* Returns:
* 0: (in non-constant time) if the record is publically invalid (i.e. too
* short etc).
* 1: if the record's padding is valid / the encryption was successful.
* -1: if the record's padding/AEAD-authenticator is invalid or, if sending,
* an internal error occurred. */
int
dtls1_enc
(
SSL
*
s
,
int
send
)
{
SSL3_RECORD
*
rec
;
EVP_CIPHER_CTX
*
ds
;
unsigned
long
l
;
int
bs
,
i
,
j
,
k
,
mac_size
=
0
;
const
EVP_CIPHER
*
enc
;
if
(
send
)
{
if
(
EVP_MD_CTX_md
(
s
->
write_hash
))
{
mac_size
=
EVP_MD_CTX_size
(
s
->
write_hash
);
if
(
mac_size
<
0
)
return
-
1
;
}
ds
=
s
->
enc_write_ctx
;
rec
=
&
(
s
->
s3
->
wrec
);
if
(
s
->
enc_write_ctx
==
NULL
)
enc
=
NULL
;
else
{
enc
=
EVP_CIPHER_CTX_cipher
(
s
->
enc_write_ctx
);
if
(
rec
->
data
!=
rec
->
input
)
/* we can't write into the input stream */
fprintf
(
stderr
,
"%s:%d: rec->data != rec->input
\n
"
,
__FILE__
,
__LINE__
);
else
if
(
EVP_CIPHER_block_size
(
ds
->
cipher
)
>
1
)
{
if
(
RAND_bytes
(
rec
->
input
,
EVP_CIPHER_block_size
(
ds
->
cipher
))
<=
0
)
return
-
1
;
}
}
}
else
{
if
(
EVP_MD_CTX_md
(
s
->
read_hash
))
{
mac_size
=
EVP_MD_CTX_size
(
s
->
read_hash
);
OPENSSL_assert
(
mac_size
>=
0
);
}
ds
=
s
->
enc_read_ctx
;
rec
=
&
(
s
->
s3
->
rrec
);
if
(
s
->
enc_read_ctx
==
NULL
)
enc
=
NULL
;
else
enc
=
EVP_CIPHER_CTX_cipher
(
s
->
enc_read_ctx
);
}
#ifdef KSSL_DEBUG
printf
(
"dtls1_enc(%d)
\n
"
,
send
);
#endif
/* KSSL_DEBUG */
if
((
s
->
session
==
NULL
)
||
(
ds
==
NULL
)
||
(
enc
==
NULL
))
{
memmove
(
rec
->
data
,
rec
->
input
,
rec
->
length
);
rec
->
input
=
rec
->
data
;
}
else
{
l
=
rec
->
length
;
bs
=
EVP_CIPHER_block_size
(
ds
->
cipher
);
if
((
bs
!=
1
)
&&
send
)
{
i
=
bs
-
((
int
)
l
%
bs
);
/* Add weird padding of upto 256 bytes */
/* we need to add 'i' padding bytes of value j */
j
=
i
-
1
;
if
(
s
->
options
&
SSL_OP_TLS_BLOCK_PADDING_BUG
)
{
if
(
s
->
s3
->
flags
&
TLS1_FLAGS_TLS_PADDING_BUG
)
j
++
;
}
for
(
k
=
(
int
)
l
;
k
<
(
int
)(
l
+
i
);
k
++
)
rec
->
input
[
k
]
=
j
;
l
+=
i
;
rec
->
length
+=
i
;
}
#ifdef KSSL_DEBUG
{
unsigned
long
ui
;
printf
(
"EVP_Cipher(ds=%p,rec->data=%p,rec->input=%p,l=%ld) ==>
\n
"
,
ds
,
rec
->
data
,
rec
->
input
,
l
);
printf
(
"
\t
EVP_CIPHER_CTX: %d buf_len, %d key_len [%d %d], %d iv_len
\n
"
,
ds
->
buf_len
,
ds
->
cipher
->
key_len
,
DES_KEY_SZ
,
DES_SCHEDULE_SZ
,
ds
->
cipher
->
iv_len
);
printf
(
"
\t\t
IV: "
);
for
(
i
=
0
;
i
<
ds
->
cipher
->
iv_len
;
i
++
)
printf
(
"%02X"
,
ds
->
iv
[
i
]);
printf
(
"
\n
"
);
printf
(
"
\t
rec->input="
);
for
(
ui
=
0
;
ui
<
l
;
ui
++
)
printf
(
" %02x"
,
rec
->
input
[
ui
]);
printf
(
"
\n
"
);
}
#endif
/* KSSL_DEBUG */
if
(
!
send
)
{
if
(
l
==
0
||
l
%
bs
!=
0
)
return
0
;
}
EVP_Cipher
(
ds
,
rec
->
data
,
rec
->
input
,
l
);
#ifdef KSSL_DEBUG
{
unsigned
long
i
;
printf
(
"
\t
rec->data="
);
for
(
i
=
0
;
i
<
l
;
i
++
)
printf
(
" %02x"
,
rec
->
data
[
i
]);
printf
(
"
\n
"
);
}
#endif
/* KSSL_DEBUG */
if
((
bs
!=
1
)
&&
!
send
)
return
tls1_cbc_remove_padding
(
s
,
rec
,
bs
,
mac_size
);
}
return
(
1
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录