Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
48f14845
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,发现更多精彩内容 >>
提交
48f14845
编写于
12月 09, 2015
作者:
A
Andy Polyakov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Configure: make no-chacha and no-poly1305 work.
Reviewed-by:
N
Richard Levitte
<
levitte@openssl.org
>
上级
a76ba82c
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
19 addition
and
2 deletion
+19
-2
Configure
Configure
+2
-0
crypto/include/internal/chacha.h
crypto/include/internal/chacha.h
+4
-0
crypto/include/internal/poly1305.h
crypto/include/internal/poly1305.h
+4
-0
ssl/ssl_algs.c
ssl/ssl_algs.c
+1
-1
util/mkdef.pl
util/mkdef.pl
+8
-1
未找到文件。
Configure
浏览文件 @
48f14845
...
...
@@ -812,6 +812,7 @@ my @disablables = (
"
camellia
",
"
capieng
",
"
cast
",
"
chacha
",
"
cmac
",
"
cms
",
"
comp
",
...
...
@@ -845,6 +846,7 @@ my @disablables = (
"
nextprotoneg
",
"
ocb
",
"
ocsp
",
"
poly1305
",
"
posix-io
",
"
psk
",
"
rc2
",
...
...
crypto/include/internal/chacha.h
浏览文件 @
48f14845
...
...
@@ -57,6 +57,10 @@
extern
"C"
{
#endif
# ifdef OPENSSL_NO_CHACHA
# error CHACHA is disabled.
# endif
/*
* ChaCha20_ctr32 encrypts |len| bytes from |inp| with the given key and
* nonce and writes the result to |out|, which may be equal to |inp|.
...
...
crypto/include/internal/poly1305.h
浏览文件 @
48f14845
...
...
@@ -49,6 +49,10 @@
*/
#include <stddef.h>
#ifdef OPENSSL_NO_POLY1305
# error POLY1305 is disabled.
#endif
#define POLY1305_BLOCK_SIZE 16
typedef
struct
poly1305_context
POLY1305
;
...
...
ssl/ssl_algs.c
浏览文件 @
48f14845
...
...
@@ -102,7 +102,7 @@ int SSL_library_init(void)
EVP_add_cipher
(
EVP_camellia_128_cbc
());
EVP_add_cipher
(
EVP_camellia_256_cbc
());
#endif
#if !defined(OPENSSL_NO_CHACHA
20
) && !defined(OPENSSL_NO_POLY1305)
#if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
EVP_add_cipher
(
EVP_chacha20_poly1305
());
#endif
...
...
util/mkdef.pl
浏览文件 @
48f14845
...
...
@@ -69,7 +69,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
"
SHA256
",
"
SHA512
",
"
RMD160
",
"
MDC2
",
"
WHIRLPOOL
",
"
RSA
",
"
DSA
",
"
DH
",
"
EC
",
"
EC2M
",
"
HMAC
",
"
AES
",
"
CAMELLIA
",
"
SEED
",
"
GOST
",
"
SCRYPT
",
"
SCRYPT
",
"
CHACHA
",
"
POLY1305
",
# EC_NISTP_64_GCC_128
"
EC_NISTP_64_GCC_128
",
# Envelope "algorithms"
...
...
@@ -128,6 +128,7 @@ my $no_cast; my $no_whirlpool; my $no_camellia; my $no_seed;
my
$no_md2
;
my
$no_md4
;
my
$no_md5
;
my
$no_sha
;
my
$no_ripemd
;
my
$no_mdc2
;
my
$no_rsa
;
my
$no_dsa
;
my
$no_dh
;
my
$no_aes
;
my
$no_scrypt
;
my
$no_ec
;
my
$no_engine
;
my
$no_hw
;
my
$no_chacha
;
my
$no_poly1305
;
my
$no_fp_api
;
my
$no_static_engine
=
1
;
my
$no_gmp
;
my
$no_deprecated
;
my
$no_sct
;
my
$no_rfc3779
;
my
$no_psk
;
my
$no_cms
;
my
$no_capieng
;
my
$no_jpake
;
my
$no_srp
;
my
$no_ec2m
;
my
$no_nistp_gcc
;
...
...
@@ -205,6 +206,8 @@ foreach (@ARGV, split(/ /, $options))
elsif
(
/^no-camellia$/
)
{
$no_camellia
=
1
;
}
elsif
(
/^no-seed$/
)
{
$no_seed
=
1
;
}
elsif
(
/^no-scrypt$/
)
{
$no_scrypt
=
1
;
}
elsif
(
/^no-chacha$/
)
{
$no_chacha
=
1
;
}
elsif
(
/^no-poly1305$/
)
{
$no_poly1305
=
1
;
}
elsif
(
/^no-evp$/
)
{
$no_evp
=
1
;
}
elsif
(
/^no-lhash$/
)
{
$no_lhash
=
1
;
}
elsif
(
/^no-stack$/
)
{
$no_stack
=
1
;
}
...
...
@@ -267,6 +270,8 @@ $ssl.=" include/openssl/srtp.h";
my
$crypto
=
"
include/openssl/crypto.h
";
$crypto
.=
"
crypto/include/internal/cryptlib.h
";
$crypto
.=
"
crypto/include/internal/chacha.h
";
# unless $no_chacha;
$crypto
.=
"
crypto/include/internal/poly1305.h
";
# unless $no_poly1305;
$crypto
.=
"
include/internal/o_dir.h
";
$crypto
.=
"
include/internal/o_str.h
";
$crypto
.=
"
include/openssl/des.h
"
;
# unless $no_des;
...
...
@@ -1188,6 +1193,8 @@ sub is_valid
if
(
$keyword
eq
"
CAMELLIA
"
&&
$no_camellia
)
{
return
0
;
}
if
(
$keyword
eq
"
SEED
"
&&
$no_seed
)
{
return
0
;
}
if
(
$keyword
eq
"
SCRYPT
"
&&
$no_scrypt
)
{
return
0
;
}
if
(
$keyword
eq
"
CHACHA
"
&&
$no_chacha
)
{
return
0
;
}
if
(
$keyword
eq
"
POLY1305
"
&&
$no_poly1305
)
{
return
0
;
}
if
(
$keyword
eq
"
EVP
"
&&
$no_evp
)
{
return
0
;
}
if
(
$keyword
eq
"
LHASH
"
&&
$no_lhash
)
{
return
0
;
}
if
(
$keyword
eq
"
STACK
"
&&
$no_stack
)
{
return
0
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录