Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
36e79832
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,发现更多精彩内容 >>
提交
36e79832
编写于
11月 07, 2015
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Replace L suffix with U
Reviewed-by:
N
Andy Polyakov
<
appro@openssl.org
>
上级
90d9e49a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
101 addition
and
101 deletion
+101
-101
include/openssl/ssl.h
include/openssl/ssl.h
+39
-39
ssl/ssl_locl.h
ssl/ssl_locl.h
+62
-62
未找到文件。
include/openssl/ssl.h
浏览文件 @
36e79832
...
...
@@ -357,17 +357,17 @@ typedef int (*custom_ext_parse_cb) (SSL *s, unsigned int ext_type,
size_t
inlen
,
int
*
al
,
void
*
parse_arg
);
/* Allow initial connection to servers that don't support RI */
# define SSL_OP_LEGACY_SERVER_CONNECT 0x00000004
L
# define SSL_OP_LEGACY_SERVER_CONNECT 0x00000004
U
/* Removed from OpenSSL 0.9.8q and 1.0.0c */
/* Dead forever, see CVE-2010-4180. */
# define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x0
L
# define SSL_OP_TLSEXT_PADDING 0x00000010
L
# define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020
L
# define SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x00000040
L
# define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080
L
# define SSL_OP_TLS_D5_BUG 0x00000100
L
# define SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG 0x0
U
# define SSL_OP_TLSEXT_PADDING 0x00000010
U
# define SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER 0x00000020
U
# define SSL_OP_SAFARI_ECDHE_ECDSA_BUG 0x00000040
U
# define SSL_OP_SSLEAY_080_CLIENT_DH_BUG 0x00000080
U
# define SSL_OP_TLS_D5_BUG 0x00000100
U
/* Removed from OpenSSL 1.1.0 */
# define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0
L
# define SSL_OP_TLS_BLOCK_PADDING_BUG 0x0
U
/* Hasn't done anything since OpenSSL 0.9.7h, retained for compatibility */
# define SSL_OP_MSIE_SSLV2_RSA_PADDING 0x0
...
...
@@ -385,55 +385,55 @@ typedef int (*custom_ext_parse_cb) (SSL *s, unsigned int ext_type,
* SSL_OP_ALL.
*/
/* added in 0.9.6e */
# define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0x00000800
L
# define SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS 0x00000800
U
/*
* SSL_OP_ALL: various bug workarounds that should be rather harmless. This
* used to be 0x000FFFFFL before 0.9.7.
*/
# define SSL_OP_ALL 0x80000BFF
L
# define SSL_OP_ALL 0x80000BFF
U
/* DTLS options */
# define SSL_OP_NO_QUERY_MTU 0x00001000
L
# define SSL_OP_NO_QUERY_MTU 0x00001000
U
/* Turn on Cookie Exchange (on relevant for servers) */
# define SSL_OP_COOKIE_EXCHANGE 0x00002000
L
# define SSL_OP_COOKIE_EXCHANGE 0x00002000
U
/* Don't use RFC4507 ticket extension */
# define SSL_OP_NO_TICKET 0x00004000
L
# define SSL_OP_NO_TICKET 0x00004000
U
/* Use Cisco's "speshul" version of DTLS_BAD_VER (as client) */
# define SSL_OP_CISCO_ANYCONNECT 0x00008000
L
# define SSL_OP_CISCO_ANYCONNECT 0x00008000
U
/* As server, disallow session resumption on renegotiation */
# define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION 0x00010000
L
# define SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION 0x00010000
U
/* Don't use compression even if supported */
# define SSL_OP_NO_COMPRESSION 0x00020000
L
# define SSL_OP_NO_COMPRESSION 0x00020000
U
/* Permit unsafe legacy renegotiation */
# define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x00040000
L
# define SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION 0x00040000
U
/* If set, always create a new key when using tmp_ecdh parameters */
# define SSL_OP_SINGLE_ECDH_USE 0x00080000
L
# define SSL_OP_SINGLE_ECDH_USE 0x00080000
U
/* If set, always create a new key when using tmp_dh parameters */
# define SSL_OP_SINGLE_DH_USE 0x00100000
L
# define SSL_OP_SINGLE_DH_USE 0x00100000
U
/* Does nothing: retained for compatibiity */
# define SSL_OP_EPHEMERAL_RSA 0x0
/*
* Set on servers to choose the cipher according to the server's preferences
*/
# define SSL_OP_CIPHER_SERVER_PREFERENCE 0x00400000
L
# define SSL_OP_CIPHER_SERVER_PREFERENCE 0x00400000
U
/*
* If set, a server will allow a client to issue a SSLv3.0 version number as
* latest version supported in the premaster secret, even when TLSv1.0
* (version 3.1) was announced in the client hello. Normally this is
* forbidden to prevent version rollback attacks.
*/
# define SSL_OP_TLS_ROLLBACK_BUG 0x00800000
L
# define SSL_OP_TLS_ROLLBACK_BUG 0x00800000
U
# define SSL_OP_NO_SSLv2 0x00000000
L
# define SSL_OP_NO_SSLv3 0x02000000
L
# define SSL_OP_NO_TLSv1 0x04000000
L
# define SSL_OP_NO_TLSv1_2 0x08000000
L
# define SSL_OP_NO_TLSv1_1 0x10000000
L
# define SSL_OP_NO_SSLv2 0x00000000
U
# define SSL_OP_NO_SSLv3 0x02000000
U
# define SSL_OP_NO_TLSv1 0x04000000
U
# define SSL_OP_NO_TLSv1_2 0x08000000
U
# define SSL_OP_NO_TLSv1_1 0x10000000
U
# define SSL_OP_NO_DTLSv1 0x04000000
L
# define SSL_OP_NO_DTLSv1_2 0x08000000
L
# define SSL_OP_NO_DTLSv1 0x04000000
U
# define SSL_OP_NO_DTLSv1_2 0x08000000
U
# define SSL_OP_NO_SSL_MASK (SSL_OP_NO_SSLv3|\
SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1|SSL_OP_NO_TLSv1_2)
...
...
@@ -442,45 +442,45 @@ typedef int (*custom_ext_parse_cb) (SSL *s, unsigned int ext_type,
# define SSL_OP_PKCS1_CHECK_1 0x0
# define SSL_OP_PKCS1_CHECK_2 0x0
# define SSL_OP_NETSCAPE_CA_DN_BUG 0x0
# define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x0
L
# define SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG 0x0
U
/*
* Make server add server-hello extension from early version of cryptopro
* draft, when GOST ciphersuite is negotiated. Required for interoperability
* with CryptoPro CSP 3.x
*/
# define SSL_OP_CRYPTOPRO_TLSEXT_BUG 0x80000000
L
# define SSL_OP_CRYPTOPRO_TLSEXT_BUG 0x80000000
U
/*
* Allow SSL_write(..., n) to return r with 0 < r < n (i.e. report success
* when just a single record has been written):
*/
# define SSL_MODE_ENABLE_PARTIAL_WRITE 0x00000001
L
# define SSL_MODE_ENABLE_PARTIAL_WRITE 0x00000001
U
/*
* Make it possible to retry SSL_write() with changed buffer location (buffer
* contents must stay the same!); this is not the default to avoid the
* misconception that non-blocking SSL_write() behaves like non-blocking
* write():
*/
# define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER 0x00000002
L
# define SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER 0x00000002
U
/*
* Never bother the application with retries if the transport is blocking:
*/
# define SSL_MODE_AUTO_RETRY 0x00000004
L
# define SSL_MODE_AUTO_RETRY 0x00000004
U
/* Don't attempt to automatically build certificate chain */
# define SSL_MODE_NO_AUTO_CHAIN 0x00000008
L
# define SSL_MODE_NO_AUTO_CHAIN 0x00000008
U
/*
* Save RAM by releasing read and write buffers when they're empty. (SSL3 and
* TLS only.) "Released" buffers are put onto a free-list in the context or
* just freed (depending on the context's setting for freelist_max_len).
*/
# define SSL_MODE_RELEASE_BUFFERS 0x00000010
L
# define SSL_MODE_RELEASE_BUFFERS 0x00000010
U
/*
* Send the current time in the Random fields of the ClientHello and
* ServerHello records for compatibility with hypothetical implementations
* that require it.
*/
# define SSL_MODE_SEND_CLIENTHELLO_TIME 0x00000020
L
# define SSL_MODE_SEND_SERVERHELLO_TIME 0x00000040
L
# define SSL_MODE_SEND_CLIENTHELLO_TIME 0x00000020
U
# define SSL_MODE_SEND_SERVERHELLO_TIME 0x00000040
U
/*
* Send TLS_FALLBACK_SCSV in the ClientHello. To be set only by applications
* that reconnect with a downgraded protocol version; see
...
...
@@ -489,14 +489,14 @@ typedef int (*custom_ext_parse_cb) (SSL *s, unsigned int ext_type,
* fallback retries, following the guidance in
* draft-ietf-tls-downgrade-scsv-00.
*/
# define SSL_MODE_SEND_FALLBACK_SCSV 0x00000080
L
# define SSL_MODE_SEND_FALLBACK_SCSV 0x00000080
U
/* Cert related flags */
/*
* Many implementations ignore some aspects of the TLS standards such as
* enforcing certifcate chain algorithms. When this is set we enforce them.
*/
# define SSL_CERT_FLAG_TLS_STRICT 0x00000001
L
# define SSL_CERT_FLAG_TLS_STRICT 0x00000001
U
/* Suite B modes, takes same values as certificate verify flags */
# define SSL_CERT_FLAG_SUITEB_128_LOS_ONLY 0x10000
...
...
ssl/ssl_locl.h
浏览文件 @
36e79832
...
...
@@ -293,33 +293,33 @@
/* Bits for algorithm_mkey (key exchange algorithm) */
/* RSA key exchange */
# define SSL_kRSA 0x00000001
L
# define SSL_kRSA 0x00000001
U
/* DH cert, RSA CA cert */
# define SSL_kDHr 0x00000002
L
# define SSL_kDHr 0x00000002
U
/* DH cert, DSA CA cert */
# define SSL_kDHd 0x00000004
L
# define SSL_kDHd 0x00000004
U
/* tmp DH key no DH cert */
# define SSL_kDHE 0x00000008
L
# define SSL_kDHE 0x00000008
U
/* synonym */
# define SSL_kEDH SSL_kDHE
/* ECDH cert, RSA CA cert */
# define SSL_kECDHr 0x00000020
L
# define SSL_kECDHr 0x00000020
U
/* ECDH cert, ECDSA CA cert */
# define SSL_kECDHe 0x00000040
L
# define SSL_kECDHe 0x00000040
U
/* ephemeral ECDH */
# define SSL_kECDHE 0x00000080
L
# define SSL_kECDHE 0x00000080
U
/* synonym */
# define SSL_kEECDH SSL_kECDHE
/* PSK */
# define SSL_kPSK 0x00000100
L
# define SSL_kPSK 0x00000100
U
/* GOST key exchange */
# define SSL_kGOST 0x00000200
L
# define SSL_kGOST 0x00000200
U
/* SRP */
# define SSL_kSRP 0x00000400
L
# define SSL_kSRP 0x00000400
U
# define SSL_kRSAPSK 0x00000800
L
# define SSL_kECDHEPSK 0x00001000
L
# define SSL_kDHEPSK 0x00002000
L
# define SSL_kRSAPSK 0x00000800
U
# define SSL_kECDHEPSK 0x00001000
U
# define SSL_kDHEPSK 0x00002000
U
/* all PSK */
...
...
@@ -327,62 +327,62 @@
/* Bits for algorithm_auth (server authentication) */
/* RSA auth */
# define SSL_aRSA 0x00000001
L
# define SSL_aRSA 0x00000001
U
/* DSS auth */
# define SSL_aDSS 0x00000002
L
# define SSL_aDSS 0x00000002
U
/* no auth (i.e. use ADH or AECDH) */
# define SSL_aNULL 0x00000004
L
# define SSL_aNULL 0x00000004
U
/* Fixed DH auth (kDHd or kDHr) */
# define SSL_aDH 0x00000008
L
# define SSL_aDH 0x00000008
U
/* Fixed ECDH auth (kECDHe or kECDHr) */
# define SSL_aECDH 0x00000010
L
# define SSL_aECDH 0x00000010
U
/* ECDSA auth*/
# define SSL_aECDSA 0x00000040
L
# define SSL_aECDSA 0x00000040
U
/* PSK auth */
# define SSL_aPSK 0x00000080
L
# define SSL_aPSK 0x00000080
U
/* GOST R 34.10-2001 signature auth */
# define SSL_aGOST01 0x00000200
L
# define SSL_aGOST01 0x00000200
U
/* SRP auth */
# define SSL_aSRP 0x00000400
L
# define SSL_aSRP 0x00000400
U
/* Bits for algorithm_enc (symmetric encryption) */
# define SSL_DES 0x00000001
L
# define SSL_3DES 0x00000002
L
# define SSL_RC4 0x00000004
L
# define SSL_RC2 0x00000008
L
# define SSL_IDEA 0x00000010
L
# define SSL_eNULL 0x00000020
L
# define SSL_AES128 0x00000040
L
# define SSL_AES256 0x00000080
L
# define SSL_CAMELLIA128 0x00000100
L
# define SSL_CAMELLIA256 0x00000200
L
# define SSL_eGOST2814789CNT 0x00000400
L
# define SSL_SEED 0x00000800
L
# define SSL_AES128GCM 0x00001000
L
# define SSL_AES256GCM 0x00002000
L
# define SSL_AES128CCM 0x00004000
L
# define SSL_AES256CCM 0x00008000
L
# define SSL_AES128CCM8 0x00010000
L
# define SSL_AES256CCM8 0x00020000
L
# define SSL_DES 0x00000001
U
# define SSL_3DES 0x00000002
U
# define SSL_RC4 0x00000004
U
# define SSL_RC2 0x00000008
U
# define SSL_IDEA 0x00000010
U
# define SSL_eNULL 0x00000020
U
# define SSL_AES128 0x00000040
U
# define SSL_AES256 0x00000080
U
# define SSL_CAMELLIA128 0x00000100
U
# define SSL_CAMELLIA256 0x00000200
U
# define SSL_eGOST2814789CNT 0x00000400
U
# define SSL_SEED 0x00000800
U
# define SSL_AES128GCM 0x00001000
U
# define SSL_AES256GCM 0x00002000
U
# define SSL_AES128CCM 0x00004000
U
# define SSL_AES256CCM 0x00008000
U
# define SSL_AES128CCM8 0x00010000
U
# define SSL_AES256CCM8 0x00020000
U
# define SSL_AES (SSL_AES128|SSL_AES256|SSL_AES128GCM|SSL_AES256GCM|SSL_AES128CCM|SSL_AES256CCM|SSL_AES128CCM8|SSL_AES256CCM8)
# define SSL_CAMELLIA (SSL_CAMELLIA128|SSL_CAMELLIA256)
/* Bits for algorithm_mac (symmetric authentication) */
# define SSL_MD5 0x00000001
L
# define SSL_SHA1 0x00000002
L
# define SSL_GOST94 0x00000004
L
# define SSL_GOST89MAC 0x00000008
L
# define SSL_SHA256 0x00000010
L
# define SSL_SHA384 0x00000020
L
# define SSL_MD5 0x00000001
U
# define SSL_SHA1 0x00000002
U
# define SSL_GOST94 0x00000004
U
# define SSL_GOST89MAC 0x00000008
U
# define SSL_SHA256 0x00000010
U
# define SSL_SHA384 0x00000020
U
/* Not a real MAC, just an indication it is part of cipher */
# define SSL_AEAD 0x00000040
L
# define SSL_AEAD 0x00000040
U
/* Bits for algorithm_ssl (protocol version) */
# define SSL_SSLV3 0x00000002
L
# define SSL_SSLV3 0x00000002
U
# define SSL_TLSV1 SSL_SSLV3
/* for now */
# define SSL_TLSV1_2 0x00000004
L
# define SSL_TLSV1_2 0x00000004
U
/* Bits for algorithm2 (handshake digests and other extra flags) */
...
...
@@ -428,24 +428,24 @@
* and ciphers goes, another extension to SSL_SUPER and/or SSL_ULTRA would
* be possible.
*/
# define SSL_EXP_MASK 0x00000003
L
# define SSL_STRONG_MASK 0x000001fc
L
# define SSL_DEFAULT_MASK 0X00000200
L
# define SSL_EXP_MASK 0x00000003
U
# define SSL_STRONG_MASK 0x000001fc
U
# define SSL_DEFAULT_MASK 0X00000200
U
# define SSL_NOT_EXP 0x00000001
L
# define SSL_EXPORT 0x00000002
L
# define SSL_NOT_EXP 0x00000001
U
# define SSL_EXPORT 0x00000002
U
# define SSL_STRONG_NONE 0x00000004
L
# define SSL_EXP40 0x00000008
L
# define SSL_STRONG_NONE 0x00000004
U
# define SSL_EXP40 0x00000008
U
# define SSL_MICRO (SSL_EXP40)
# define SSL_EXP56 0x00000010
L
# define SSL_EXP56 0x00000010
U
# define SSL_MINI (SSL_EXP56)
# define SSL_LOW 0x00000020
L
# define SSL_MEDIUM 0x00000040
L
# define SSL_HIGH 0x00000080
L
# define SSL_FIPS 0x00000100
L
# define SSL_LOW 0x00000020
U
# define SSL_MEDIUM 0x00000040
U
# define SSL_HIGH 0x00000080
U
# define SSL_FIPS 0x00000100
U
# define SSL_NOT_DEFAULT 0x00000200
L
# define SSL_NOT_DEFAULT 0x00000200
U
/* we have used 000003ff - 22 bits left to go */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录