Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
1 年多 前同步成功

通知 10
Star 18
Fork 1
T
Third Party Openssl
提交 c454dbcd 编写于 作者: R Richard Levitte
浏览文件
操作

Sort platforms lexicographically as well. Also, support more than two 

variants of a symbol.
上级 f3a31068
隐藏空白更改
内联 并排
Showing with 29 addition and 25 deletion
util/libeay.num
浏览文件 @ c454dbcd
...@@ -701,7 +701,7 @@ bn_mul_words 707 EXIST::FUNCTION: ...@@ -701,7 +701,7 @@ bn_mul_words 707 EXIST::FUNCTION:
BN_uadd 708 EXIST::FUNCTION: BN_uadd 708 EXIST::FUNCTION:
BN_usub 709 EXIST::FUNCTION: BN_usub 709 EXIST::FUNCTION:
bn_sqr_words 710 EXIST::FUNCTION: bn_sqr_words 710 EXIST::FUNCTION:
crypt 711 EXIST:!PERL5,!NeXT,!__FreeBSD__:FUNCTION:DES crypt 711 EXIST:!NeXT,!PERL5,!__FreeBSD__:FUNCTION:DES
d2i_ASN1_BIT_STRING 712 EXIST::FUNCTION: d2i_ASN1_BIT_STRING 712 EXIST::FUNCTION:
d2i_ASN1_BOOLEAN 713 EXIST::FUNCTION: d2i_ASN1_BOOLEAN 713 EXIST::FUNCTION:
d2i_ASN1_HEADER 714 EXIST::FUNCTION: d2i_ASN1_HEADER 714 EXIST::FUNCTION:
...@@ -984,8 +984,8 @@ BIO_ghbn_ctrl 1003 EXIST::FUNCTION: ...@@ -984,8 +984,8 @@ BIO_ghbn_ctrl 1003 EXIST::FUNCTION:
CRYPTO_free_ex_data 1004 EXIST::FUNCTION: CRYPTO_free_ex_data 1004 EXIST::FUNCTION:
CRYPTO_get_ex_data 1005 EXIST::FUNCTION: CRYPTO_get_ex_data 1005 EXIST::FUNCTION:
CRYPTO_set_ex_data 1007 EXIST::FUNCTION: CRYPTO_set_ex_data 1007 EXIST::FUNCTION:
ERR_load_CRYPTO_strings 1009 EXIST:!WIN16,!VMS:FUNCTION: ERR_load_CRYPTO_strings 1009 EXIST:!VMS,!WIN16:FUNCTION:
ERR_load_CRYPTOlib_strings 1009 EXIST:WIN16,VMS:FUNCTION: ERR_load_CRYPTOlib_strings 1009 EXIST:VMS,WIN16:FUNCTION:
EVP_PKEY_bits 1010 EXIST::FUNCTION: EVP_PKEY_bits 1010 EXIST::FUNCTION:
MD5_Transform 1011 EXIST::FUNCTION:MD5 MD5_Transform 1011 EXIST::FUNCTION:MD5
SHA1_Transform 1012 EXIST::FUNCTION:SHA,SHA1 SHA1_Transform 1012 EXIST::FUNCTION:SHA,SHA1
...@@ -1137,11 +1137,11 @@ ERR_load_X509V3_strings 1164 EXIST::FUNCTION: ...@@ -1137,11 +1137,11 @@ ERR_load_X509V3_strings 1164 EXIST::FUNCTION:
NETSCAPE_CERT_SEQUENCE_free 1165 EXIST::FUNCTION: NETSCAPE_CERT_SEQUENCE_free 1165 EXIST::FUNCTION:
NETSCAPE_CERT_SEQUENCE_new 1166 EXIST::FUNCTION: NETSCAPE_CERT_SEQUENCE_new 1166 EXIST::FUNCTION:
OBJ_txt2obj 1167 EXIST::FUNCTION: OBJ_txt2obj 1167 EXIST::FUNCTION:
PEM_read_NETSCAPE_CERT_SEQUENCE 1168 EXIST:!WIN16,!VMS:FUNCTION: PEM_read_NETSCAPE_CERT_SEQUENCE 1168 EXIST:!VMS,!WIN16:FUNCTION:
PEM_read_NS_CERT_SEQ 1168 EXIST:VMS:FUNCTION: PEM_read_NS_CERT_SEQ 1168 EXIST:VMS:FUNCTION:
PEM_read_bio_NETSCAPE_CERT_SEQUENCE 1169 EXIST:!VMS:FUNCTION: PEM_read_bio_NETSCAPE_CERT_SEQUENCE 1169 EXIST:!VMS:FUNCTION:
PEM_read_bio_NS_CERT_SEQ 1169 EXIST:VMS:FUNCTION: PEM_read_bio_NS_CERT_SEQ 1169 EXIST:VMS:FUNCTION:
PEM_write_NETSCAPE_CERT_SEQUENCE 1170 EXIST:!WIN16,!VMS:FUNCTION: PEM_write_NETSCAPE_CERT_SEQUENCE 1170 EXIST:!VMS,!WIN16:FUNCTION:
PEM_write_NS_CERT_SEQ 1170 EXIST:VMS:FUNCTION: PEM_write_NS_CERT_SEQ 1170 EXIST:VMS:FUNCTION:
PEM_write_bio_NETSCAPE_CERT_SEQUENCE 1171 EXIST:!VMS:FUNCTION: PEM_write_bio_NETSCAPE_CERT_SEQUENCE 1171 EXIST:!VMS:FUNCTION:
PEM_write_bio_NS_CERT_SEQ 1171 EXIST:VMS:FUNCTION: PEM_write_bio_NS_CERT_SEQ 1171 EXIST:VMS:FUNCTION:
...@@ -1437,10 +1437,10 @@ PEM_read_PKCS8 1782 EXIST:!WIN16:FUNCTION: ...@@ -1437,10 +1437,10 @@ PEM_read_PKCS8 1782 EXIST:!WIN16:FUNCTION:
d2i_PKCS8_PRIV_KEY_INFO_bio 1783 EXIST::FUNCTION:BIO d2i_PKCS8_PRIV_KEY_INFO_bio 1783 EXIST::FUNCTION:BIO
d2i_PKCS8_fp 1784 EXIST::FUNCTION:FP_API d2i_PKCS8_fp 1784 EXIST::FUNCTION:FP_API
PEM_write_PKCS8 1785 EXIST:!WIN16:FUNCTION: PEM_write_PKCS8 1785 EXIST:!WIN16:FUNCTION:
PEM_read_PKCS8_PRIV_KEY_INFO 1786 EXIST:!WIN16,!VMS:FUNCTION: PEM_read_PKCS8_PRIV_KEY_INFO 1786 EXIST:!VMS,!WIN16:FUNCTION:
PEM_read_P8_PRIV_KEY_INFO 1786 EXIST:VMS:FUNCTION: PEM_read_P8_PRIV_KEY_INFO 1786 EXIST:VMS:FUNCTION:
PEM_read_bio_PKCS8 1787 EXIST::FUNCTION: PEM_read_bio_PKCS8 1787 EXIST::FUNCTION:
PEM_write_PKCS8_PRIV_KEY_INFO 1788 EXIST:!WIN16,!VMS:FUNCTION: PEM_write_PKCS8_PRIV_KEY_INFO 1788 EXIST:!VMS,!WIN16:FUNCTION:
PEM_write_P8_PRIV_KEY_INFO 1788 EXIST:VMS:FUNCTION: PEM_write_P8_PRIV_KEY_INFO 1788 EXIST:VMS:FUNCTION:
PKCS5_PBE_keyivgen 1789 EXIST::FUNCTION: PKCS5_PBE_keyivgen 1789 EXIST::FUNCTION:
i2d_PKCS8_bio 1790 EXIST::FUNCTION:BIO i2d_PKCS8_bio 1790 EXIST::FUNCTION:BIO
...@@ -2035,8 +2035,8 @@ i2d_OCSP_REVOKEDINFO 2613 EXIST::FUNCTION: ...@@ -2035,8 +2035,8 @@ i2d_OCSP_REVOKEDINFO 2613 EXIST::FUNCTION:
d2i_OCSP_RESPBYTES 2614 EXIST::FUNCTION: d2i_OCSP_RESPBYTES 2614 EXIST::FUNCTION:
i2d_OCSP_CERTID 2615 EXIST::FUNCTION: i2d_OCSP_CERTID 2615 EXIST::FUNCTION:
d2i_OCSP_SINGLERESP 2616 EXIST::FUNCTION: d2i_OCSP_SINGLERESP 2616 EXIST::FUNCTION:
OCSP_crlID_new 2617 EXIST:!WIN16,!VMS:FUNCTION: OCSP_crlID_new 2617 EXIST:!VMS,!WIN16:FUNCTION:
OCSP_crlID2_new 2617 EXIST:WIN16,VMS:FUNCTION: OCSP_crlID2_new 2617 EXIST:VMS,WIN16:FUNCTION:
OCSP_BASICRESP_new 2618 EXIST::FUNCTION: OCSP_BASICRESP_new 2618 EXIST::FUNCTION:
d2i_OCSP_SERVICELOC 2619 EXIST::FUNCTION: d2i_OCSP_SERVICELOC 2619 EXIST::FUNCTION:
OCSP_response_new 2620 NOEXIST::FUNCTION: OCSP_response_new 2620 NOEXIST::FUNCTION:
......
util/mkdef.pl
浏览文件 @ c454dbcd
...@@ -384,9 +384,13 @@ sub do_defs ...@@ -384,9 +384,13 @@ sub do_defs
$variant_cnt{$s}++; $variant_cnt{$s}++;
$a .= "{$variant_cnt{$s}}"; $a .= "{$variant_cnt{$s}}";
} }
if (defined($variant{$s})) { $variant{$s} .= ";"; } my $toadd = $a.":".$a1.(defined($k)?":".$k:"");
$variant{$s} = $a.":".$a1; my $togrep = $s.'(\{[0-9]+\})?:'.$a1.(defined($k)?":".$k:"");
if (defined($k)) { $variant{$s} .= ":$k"; } if (!grep(/^$togrep$/,
split(/;/, defined($variant{$s})?$variant{$s}:""))) {
if (defined($variant{$s})) { $variant{$s} .= ";"; }
$variant{$s} .= $toadd;
}
print STDERR "DEBUG: make_variant: Exit with variant of ",$s," = ",$variant{$s},"\n" if $debug; print STDERR "DEBUG: make_variant: Exit with variant of ",$s," = ",$variant{$s},"\n" if $debug;
}; };
...@@ -679,7 +683,6 @@ sub do_defs ...@@ -679,7 +683,6 @@ sub do_defs
&$make_variant("$1_it","$1_it", &$make_variant("$1_it","$1_it",
"EXPORT_VAR_AS_FUNCTION", "EXPORT_VAR_AS_FUNCTION",
"FUNCTION"); "FUNCTION");
print STDERR "DEBUG: after make_variant: variant of $1_it = ",$variant{"$1_it"},"\n" if $debug;
next; next;
} elsif (/^\s*DECLARE_ASN1_SET_OF\s*\(\s*(\w*)\s*\)/) { } elsif (/^\s*DECLARE_ASN1_SET_OF\s*\(\s*(\w*)\s*\)/) {
next; next;
...@@ -751,7 +754,6 @@ sub do_defs ...@@ -751,7 +754,6 @@ sub do_defs
&$make_variant("_shadow_$2","_shadow_$2", &$make_variant("_shadow_$2","_shadow_$2",
"EXPORT_VAR_AS_FUNCTION", "EXPORT_VAR_AS_FUNCTION",
"FUNCTION"); "FUNCTION");
print STDERR "DEBUG: after make_variant: variant of $1_it = ",$variant{"$1_it"},"\n" if $debug;
} elsif ($tag{'CONST_STRICT'} != 1) { } elsif ($tag{'CONST_STRICT'} != 1) {
if (/\{|\/\*|\([^\)]*$/) { if (/\{|\/\*|\([^\)]*$/) {
$line = $_; $line = $_;
...@@ -831,15 +833,17 @@ sub do_defs ...@@ -831,15 +833,17 @@ sub do_defs
$algorithm{$s} .= ','.$a; $algorithm{$s} .= ','.$a;
if (defined($variant{$s})) { if (defined($variant{$s})) {
(my $r, my $p, my $k) = split(/:/,$variant{$s}); foreach $v (split /;/,$variant{$s}) {
my $ip = join ',',map({ /^!(.*)$/ ? $1 : "!".$_ } split /,/, $p); (my $r, my $p, my $k) = split(/:/,$v);
$syms{$r} = 1; my $ip = join ',',map({ /^!(.*)$/ ? $1 : "!".$_ } split /,/, $p);
if (!defined($k)) { $k = $kind{$s}; } $syms{$r} = 1;
$kind{$r} = $k."(".$s.")"; if (!defined($k)) { $k = $kind{$s}; }
$algorithm{$r} = $algorithm{$s}; $kind{$r} = $k."(".$s.")";
$platform{$r} = &reduce_platforms($platform{$s}.",".$p.",".$p); $algorithm{$r} = $algorithm{$s};
$platform{$s} = &reduce_platforms($platform{$s}.','.$ip.','.$ip); $platform{$r} = &reduce_platforms($platform{$s}.",".$p.",".$p);
print STDERR "DEBUG: \$variant{\"$s\"} = ",$variant{$s},"; \$r = $r; \$p = ",$platform{$r},"; \$a = ",$algorithm{$r},"; \$kind = ",$kind{$r},"\n" if $debug; $platform{$s} = &reduce_platforms($platform{$s}.','.$ip.','.$ip);
print STDERR "DEBUG: \$variant{\"$s\"} = ",$v,"; \$r = $r; \$p = ",$platform{$r},"; \$a = ",$algorithm{$r},"; \$kind = ",$kind{$r},"\n" if $debug;
}
} }
print STDERR "DEBUG: \$s = $s; \$p = ",$platform{$s},"; \$a = ",$algorithm{$s},"; \$kind = ",$kind{$s},"\n" if $debug; print STDERR "DEBUG: \$s = $s; \$p = ",$platform{$s},"; \$a = ",$algorithm{$s},"; \$kind = ",$kind{$s},"\n" if $debug;
} }
...@@ -901,7 +905,7 @@ sub reduce_platforms ...@@ -901,7 +905,7 @@ sub reduce_platforms
delete $p{""}; delete $p{""};
$ret = join(',',map { $p{$_} < 0 ? "!".$_ : $_ } keys %p); $ret = join(',',sort(map { $p{$_} < 0 ? "!".$_ : $_ } keys %p));
print STDERR "DEBUG: Exiting reduce_platforms with \"$ret\"\n" print STDERR "DEBUG: Exiting reduce_platforms with \"$ret\"\n"
if $debug; if $debug;
return $ret; return $ret;
......
util/ssleay.num
浏览文件 @ c454dbcd
...@@ -169,7 +169,7 @@ SSL_add_file_cert_subjects_to_stack 185 EXIST:!VMS:FUNCTION:STDIO ...@@ -169,7 +169,7 @@ SSL_add_file_cert_subjects_to_stack 185 EXIST:!VMS:FUNCTION:STDIO
SSL_add_file_cert_subjs_to_stk 185 EXIST:VMS:FUNCTION:STDIO SSL_add_file_cert_subjs_to_stk 185 EXIST:VMS:FUNCTION:STDIO
SSL_set_tmp_rsa_callback 186 EXIST::FUNCTION:RSA SSL_set_tmp_rsa_callback 186 EXIST::FUNCTION:RSA
SSL_set_tmp_dh_callback 187 EXIST::FUNCTION:DH SSL_set_tmp_dh_callback 187 EXIST::FUNCTION:DH
SSL_add_dir_cert_subjects_to_stack 188 EXIST:!WIN32,!VMS:FUNCTION:STDIO SSL_add_dir_cert_subjects_to_stack 188 EXIST:!VMS,!WIN32:FUNCTION:STDIO
SSL_add_dir_cert_subjs_to_stk 188 NOEXIST::FUNCTION: SSL_add_dir_cert_subjs_to_stk 188 NOEXIST::FUNCTION:
SSL_set_session_id_context 189 EXIST::FUNCTION: SSL_set_session_id_context 189 EXIST::FUNCTION:
SSL_CTX_use_certificate_chain_file 222 EXIST:!VMS:FUNCTION:STDIO SSL_CTX_use_certificate_chain_file 222 EXIST:!VMS:FUNCTION:STDIO
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或