Hakase/openssl-custom
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix crash and latest update.

Browse Source
This commit is contained in:
Hakase
2019-03-16 01:19:24 +09:00
parent ee0cf37f98
commit c03e0c45f8
168 changed files with 12859 additions and 1295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/libcrypto.num
+136 -1
View File
@@ -4655,4 +4655,139 @@ OSSL_trace_set_callback 4610 3_0_0 EXIST::FUNCTION:
OSSL_trace_enabled 4611 3_0_0 EXIST::FUNCTION:
OSSL_trace_begin 4612 3_0_0 EXIST::FUNCTION:
OSSL_trace_end 4613 3_0_0 EXIST::FUNCTION:
EVP_chacha20_poly1305_draft 4614 3_0_0 EXIST::FUNCTION:CHACHA,POLY1305
OSSL_PROVIDER_load 4614 3_0_0 EXIST::FUNCTION:
OSSL_PROVIDER_unload 4615 3_0_0 EXIST::FUNCTION:
OSSL_PROVIDER_add_builtin 4616 3_0_0 EXIST::FUNCTION:
OSSL_PROVIDER_get_param_types 4617 3_0_0 EXIST::FUNCTION:
OSSL_PROVIDER_get_params 4618 3_0_0 EXIST::FUNCTION:
d2i_OSSL_CRMF_ENCRYPTEDVALUE 4619 3_0_0 EXIST::FUNCTION:CMP
i2d_OSSL_CRMF_ENCRYPTEDVALUE 4620 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_ENCRYPTEDVALUE_free 4621 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_ENCRYPTEDVALUE_new 4622 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_ENCRYPTEDVALUE_it 4623 3_0_0 NOEXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_ENCRYPTEDVALUE_it 4624 3_0_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_ENCRYPTEDVALUE_it 4624 3_0_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMP
d2i_OSSL_CRMF_MSG 4625 3_0_0 EXIST::FUNCTION:CMP
i2d_OSSL_CRMF_MSG 4626 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_free 4627 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_new 4628 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_it 4629 3_0_0 NOEXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_MSG_it 4630 3_0_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_MSG_it 4630 3_0_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMP
d2i_OSSL_CRMF_PBMPARAMETER 4631 3_0_0 EXIST::FUNCTION:CMP
i2d_OSSL_CRMF_PBMPARAMETER 4632 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_PBMPARAMETER_free 4633 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_PBMPARAMETER_new 4634 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_PBMPARAMETER_it 4635 3_0_0 NOEXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_PBMPARAMETER_it 4636 3_0_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_PBMPARAMETER_it 4636 3_0_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMP
d2i_OSSL_CRMF_CERTID 4637 3_0_0 EXIST::FUNCTION:CMP
i2d_OSSL_CRMF_CERTID 4638 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_CERTID_free 4639 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_CERTID_new 4640 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_CERTID_it 4641 3_0_0 NOEXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_CERTID_it 4642 3_0_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_CERTID_it 4642 3_0_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMP
d2i_OSSL_CRMF_PKIPUBLICATIONINFO 4643 3_0_0 EXIST::FUNCTION:CMP
i2d_OSSL_CRMF_PKIPUBLICATIONINFO 4644 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_PKIPUBLICATIONINFO_free 4645 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_PKIPUBLICATIONINFO_new 4646 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_PKIPUBLICATIONINFO_it 4647 3_0_0 NOEXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_PKIPUBLICATIONINFO_it 4648 3_0_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_PKIPUBLICATIONINFO_it 4648 3_0_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMP
d2i_OSSL_CRMF_SINGLEPUBINFO 4649 3_0_0 EXIST::FUNCTION:CMP
i2d_OSSL_CRMF_SINGLEPUBINFO 4650 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_SINGLEPUBINFO_free 4651 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_SINGLEPUBINFO_new 4652 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_SINGLEPUBINFO_it 4653 3_0_0 NOEXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_SINGLEPUBINFO_it 4654 3_0_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_SINGLEPUBINFO_it 4654 3_0_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMP
d2i_OSSL_CRMF_CERTTEMPLATE 4655 3_0_0 EXIST::FUNCTION:CMP
i2d_OSSL_CRMF_CERTTEMPLATE 4656 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_CERTTEMPLATE_free 4657 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_CERTTEMPLATE_new 4658 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_CERTTEMPLATE_it 4659 3_0_0 NOEXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_CERTTEMPLATE_it 4660 3_0_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_CERTTEMPLATE_it 4660 3_0_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMP
d2i_OSSL_CRMF_MSGS 4661 3_0_0 EXIST::FUNCTION:CMP
i2d_OSSL_CRMF_MSGS 4662 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSGS_free 4663 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSGS_new 4664 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSGS_it 4665 3_0_0 NOEXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_MSGS_it 4666 3_0_0 EXIST:!EXPORT_VAR_AS_FUNCTION:VARIABLE:CMP
OSSL_CRMF_MSGS_it 4666 3_0_0 EXIST:EXPORT_VAR_AS_FUNCTION:FUNCTION:CMP
OSSL_CRMF_pbmp_new 4667 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_pbm_new 4668 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_set1_regCtrl_regToken 4669 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_set1_regCtrl_authenticator 4670 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_PKIPublicationInfo_push0_SinglePubInfo 4671 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_set0_SinglePubInfo 4672 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_set_PKIPublicationInfo_action 4673 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_set1_regCtrl_pkiPublicationInfo 4674 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_set1_regCtrl_protocolEncrKey 4675 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_set1_regCtrl_oldCertID 4676 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_CERTID_gen 4677 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_set1_regInfo_utf8Pairs 4678 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_set1_regInfo_certReq 4679 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_set_validity 4680 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_set_certReqId 4681 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_get_certReqId 4682 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_set0_extensions 4683 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_push0_extension 4684 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_create_popo 4685 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSGS_verify_popo 4686 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_MSG_get0_tmpl 4687 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_CERTTEMPLATE_get0_serialNumber 4688 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_CERTTEMPLATE_get0_issuer 4689 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_CERTTEMPLATE_fill 4690 3_0_0 EXIST::FUNCTION:CMP
OSSL_CRMF_ENCRYPTEDVALUE_get1_encCert 4691 3_0_0 EXIST::FUNCTION:CMP
ERR_load_CRMF_strings 4692 3_0_0 EXIST::FUNCTION:CMP
OSSL_PARAM_locate 4693 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_int 4694 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_uint 4695 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_long 4696 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_ulong 4697 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_int32 4698 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_uint32 4699 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_int64 4700 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_uint64 4701 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_size_t 4702 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_BN 4703 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_double 4704 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_utf8_string 4705 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_utf8_ptr 4706 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_octet_string 4707 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_construct_octet_ptr 4708 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_int 4709 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_uint 4710 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_long 4711 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_ulong 4712 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_int32 4713 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_uint32 4714 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_int64 4715 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_uint64 4716 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_size_t 4717 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_int 4718 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_uint 4719 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_long 4720 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_ulong 4721 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_int32 4722 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_uint32 4723 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_int64 4724 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_uint64 4725 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_size_t 4726 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_double 4727 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_double 4728 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_BN 4729 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_BN 4730 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_utf8_string 4731 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_utf8_string 4732 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_octet_string 4733 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_octet_string 4734 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_utf8_ptr 4735 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_utf8_ptr 4736 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_get_octet_ptr 4737 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_octet_ptr 4738 3_0_0 EXIST::FUNCTION:
X509_set_sm2_id 4739 3_0_0 EXIST::FUNCTION:SM2
X509_get0_sm2_id 4740 3_0_0 EXIST::FUNCTION:SM2
EVP_chacha20_poly1305_draft 4741 3_0_0 EXIST::FUNCTION:CHACHA,POLY1305
util/mkerr.pl
+5 -3
View File
@@ -417,9 +417,7 @@ print STDERR "\n" if $debug;
&phase("Writing files");
my $newstate = 0;
foreach my $lib ( keys %errorfile ) {
if ( ! $fnew{$lib} && ! $rnew{$lib} ) {
next unless $rebuild;
}
next if ! $fnew{$lib} && ! $rnew{$lib} && ! $rebuild;
next if scalar keys %modules > 0 && !$modules{$lib};
next if $nowrite;
print STDERR "$lib: $fnew{$lib} new functions\n" if $fnew{$lib};
@@ -455,6 +453,10 @@ foreach my $lib ( keys %errorfile ) {
#ifndef HEADER_${lib}ERR_H
# define HEADER_${lib}ERR_H
# ifndef HEADER_SYMHACKS_H
# include <openssl/symhacks.h>
# endif
EOF
if ( $internal ) {
# Declare the load function because the generate C file
util/perl/OpenSSL/ParseC.pm
+9
View File
@@ -578,6 +578,15 @@ my @chandlers = (
{ regexp => qr/extern "C" (.*;)/,
massager => sub { return ($1); },
},
# any other extern is just ignored
{ regexp => qr/^\s* # Any spaces before
extern # The keyword we look for
\b # word to non-word boundary
.* # Anything after
;
/x,
massager => sub { return (); },
},
# union, struct and enum definitions
# Because this one might appear a little everywhere within type
# definitions, we take it out and replace it with just
util/private.num
+22
View File
@@ -33,6 +33,7 @@ OPENSSL_Applink external
OPENSSL_CTX datatype
NAMING_AUTHORITY datatype
OSSL_PARAM datatype
OSSL_PROVIDER datatype
OSSL_STORE_CTX datatype
OSSL_STORE_INFO datatype
OSSL_STORE_LOADER datatype
@@ -322,6 +323,21 @@ OpenSSL_add_all_algorithms define deprecated 1.1.0
OpenSSL_add_all_ciphers define deprecated 1.1.0
OpenSSL_add_all_digests define deprecated 1.1.0
OpenSSL_add_ssl_algorithms define
OSSL_PARAM_utf8_ptr define
OSSL_PARAM_SIZED_BN define
OSSL_PARAM_TYPE generic
OSSL_PARAM_construct_TYPE generic
OSSL_PARAM_octet_string define
OSSL_PARAM_SIZED_octet_ptr define
OSSL_PARAM_utf8_string define
OSSL_PARAM_octet_ptr define
OSSL_PARAM_SIZED_utf8_ptr define
OSSL_PARAM_SIZED_utf8_string define
OSSL_PARAM_SIZED_TYPE generic
OSSL_PARAM_get_TYPE generic
OSSL_PARAM_END define
OSSL_PARAM_set_TYPE generic
OSSL_PARAM_SIZED_octet_string define
PEM_FLAG_EAY_COMPATIBLE define
PEM_FLAG_ONLY_B64 define
PEM_FLAG_SECURE define
@@ -487,3 +503,9 @@ ASYNC_STATUS_EAGAIN define
ASYNC_STATUS_OK define
ASYNC_STATUS_ERR define
ASYNC_STATUS_UNSUPPORTED define
OSSL_TRACE_BEGIN define
OSSL_TRACE_END define
OSSL_TRACE_CANCEL define
OSSL_TRACE1 define
OSSL_TRACE2 define
OSSL_TRACE9 define
util/providers.num
+1
View File
@@ -0,0 +1 @@
OSSL_provider_init 1 * EXIST::FUNCTION: