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

Latest update.

Browse Source
This commit is contained in:
Hakase
2020-05-17 20:27:18 +09:00
parent ad9fce94c2
commit 3a6d64bb68
619 changed files with 13638 additions and 4698 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/libcrypto.num
+19 -6
View File
@@ -144,7 +144,7 @@ IDEA_set_decrypt_key 146 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3
X509_STORE_CTX_set_flags 147 3_0_0 EXIST::FUNCTION:
BIO_ADDR_rawmake 148 3_0_0 EXIST::FUNCTION:SOCK
EVP_PKEY_asn1_set_ctrl 149 3_0_0 EXIST::FUNCTION:
EC_POINTs_mul 150 3_0_0 EXIST::FUNCTION:EC
EC_POINTs_mul 150 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,EC
ASN1_get_object 151 3_0_0 EXIST::FUNCTION:
i2d_IPAddressFamily 152 3_0_0 EXIST::FUNCTION:RFC3779
ENGINE_get_ctrl_function 153 3_0_0 EXIST::FUNCTION:ENGINE
@@ -490,7 +490,7 @@ X509_CRL_print 499 3_0_0 EXIST::FUNCTION:
WHIRLPOOL_Update 500 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,WHIRLPOOL
DSA_get_ex_data 501 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DSA
BN_copy 502 3_0_0 EXIST::FUNCTION:
FIPS_mode_set 503 3_0_0 EXIST::FUNCTION:
FIPS_mode_set 503 3_0_0 NOEXIST::FUNCTION:
X509_VERIFY_PARAM_add0_policy 504 3_0_0 EXIST::FUNCTION:
PKCS7_cert_from_signer_info 505 3_0_0 EXIST::FUNCTION:
X509_TRUST_get_trust 506 3_0_0 EXIST::FUNCTION:
@@ -2534,7 +2534,7 @@ OPENSSL_strnlen 2587 3_0_0 EXIST::FUNCTION:
IDEA_ecb_encrypt 2588 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,IDEA
ASN1_STRING_set_default_mask 2589 3_0_0 EXIST::FUNCTION:
TS_VERIFY_CTX_add_flags 2590 3_0_0 EXIST::FUNCTION:TS
FIPS_mode 2591 3_0_0 EXIST::FUNCTION:
FIPS_mode 2591 3_0_0 NOEXIST::FUNCTION:
d2i_ASN1_UNIVERSALSTRING 2592 3_0_0 EXIST::FUNCTION:
NAME_CONSTRAINTS_free 2593 3_0_0 EXIST::FUNCTION:
EC_GROUP_get_order 2594 3_0_0 EXIST::FUNCTION:EC
@@ -3163,7 +3163,7 @@ ACCESS_DESCRIPTION_free 3228 3_0_0 EXIST::FUNCTION:
BN_nist_mod_384 3229 3_0_0 EXIST::FUNCTION:
i2d_EC_PUBKEY_fp 3230 3_0_0 EXIST::FUNCTION:EC,STDIO
ENGINE_set_default_pkey_meths 3231 3_0_0 EXIST::FUNCTION:ENGINE
DH_bits 3232 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DH
DH_bits 3232 3_0_0 EXIST::FUNCTION:DH
i2d_X509_ALGORS 3233 3_0_0 EXIST::FUNCTION:
EVP_camellia_192_cfb1 3234 3_0_0 EXIST::FUNCTION:CAMELLIA
TS_RESP_CTX_add_failure_info 3235 3_0_0 EXIST::FUNCTION:TS
@@ -4045,7 +4045,7 @@ X509_STORE_unlock 4133 3_0_0 EXIST::FUNCTION:
X509_STORE_lock 4134 3_0_0 EXIST::FUNCTION:
X509_set_proxy_pathlen 4135 3_0_0 EXIST::FUNCTION:
X509_get_proxy_pathlen 4136 3_0_0 EXIST::FUNCTION:
DSA_bits 4137 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0,DSA
DSA_bits 4137 3_0_0 EXIST::FUNCTION:DSA
EVP_PKEY_set1_tls_encodedpoint 4138 3_0_0 EXIST::FUNCTION:
EVP_PKEY_get1_tls_encodedpoint 4139 3_0_0 EXIST::FUNCTION:
ASN1_STRING_get0_data 4140 3_0_0 EXIST::FUNCTION:
@@ -4771,7 +4771,7 @@ OSSL_CMP_CTX_set0_trustedStore ? 3_0_0 EXIST::FUNCTION:CMP
OSSL_CMP_CTX_get0_trustedStore ? 3_0_0 EXIST::FUNCTION:CMP
OSSL_CMP_CTX_set1_untrusted_certs ? 3_0_0 EXIST::FUNCTION:CMP
OSSL_CMP_CTX_get0_untrusted_certs ? 3_0_0 EXIST::FUNCTION:CMP
OSSL_CMP_CTX_set1_clCert ? 3_0_0 EXIST::FUNCTION:CMP
OSSL_CMP_CTX_set1_cert ? 3_0_0 EXIST::FUNCTION:CMP
OSSL_CMP_CTX_set1_pkey ? 3_0_0 EXIST::FUNCTION:CMP
OSSL_CMP_CTX_set1_referenceValue ? 3_0_0 EXIST::FUNCTION:CMP
OSSL_CMP_CTX_set1_secretValue ? 3_0_0 EXIST::FUNCTION:CMP
@@ -4902,6 +4902,7 @@ i2d_X509_PUBKEY_bio ? 3_0_0 EXIST::FUNCTION:
RSA_get0_pss_params ? 3_0_0 EXIST::FUNCTION:RSA
X509_cmp_timeframe ? 3_0_0 EXIST::FUNCTION:
OSSL_CMP_MSG_get0_header ? 3_0_0 EXIST::FUNCTION:CMP
OSSL_CMP_MSG_update_transactionID ? 3_0_0 EXIST::FUNCTION:CMP
BIO_f_prefix ? 3_0_0 EXIST::FUNCTION:
EVP_PKEY_CTX_new_from_name ? 3_0_0 EXIST::FUNCTION:
EVP_PKEY_CTX_new_from_pkey ? 3_0_0 EXIST::FUNCTION:
@@ -5072,6 +5073,9 @@ EVP_PKEY_CTX_set_dh_paramgen_generator ? 3_0_0 EXIST::FUNCTION:DH
EVP_PKEY_CTX_set_dh_nid ? 3_0_0 EXIST::FUNCTION:DH
EVP_PKEY_CTX_set_dh_rfc5114 ? 3_0_0 EXIST::FUNCTION:DH
EVP_PKEY_CTX_set_dhx_rfc5114 ? 3_0_0 EXIST::FUNCTION:DH
X509_VERIFY_PARAM_get0_host ? 3_0_0 EXIST::FUNCTION:
X509_VERIFY_PARAM_get0_email ? 3_0_0 EXIST::FUNCTION:
X509_VERIFY_PARAM_get1_ip_asc ? 3_0_0 EXIST::FUNCTION:
X509_verify_ex ? 3_0_0 EXIST::FUNCTION:
X509_REQ_verify_ex ? 3_0_0 EXIST::FUNCTION:
X509_ALGOR_copy ? 3_0_0 EXIST::FUNCTION:
@@ -5079,4 +5083,13 @@ X509_REQ_set0_signature ? 3_0_0 EXIST::FUNCTION:
X509_REQ_set1_signature_algo ? 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_modified ? 3_0_0 EXIST::FUNCTION:
OSSL_PARAM_set_all_unmodified ? 3_0_0 EXIST::FUNCTION:
EVP_default_properties_is_fips_enabled ? 3_0_0 EXIST::FUNCTION:
EVP_default_properties_enable_fips ? 3_0_0 EXIST::FUNCTION:
EVP_PKEY_new_raw_private_key_with_libctx ? 3_0_0 EXIST::FUNCTION:
EVP_PKEY_new_raw_public_key_with_libctx ? 3_0_0 EXIST::FUNCTION:
OSSL_STORE_attach ? 3_0_0 EXIST::FUNCTION:
OSSL_STORE_LOADER_set_attach ? 3_0_0 EXIST::FUNCTION:
EVP_PKEY_CTX_set_rsa_pss_keygen_saltlen ? 3_0_0 EXIST::FUNCTION:RSA
EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md ? 3_0_0 EXIST::FUNCTION:RSA
EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md_name ? 3_0_0 EXIST::FUNCTION:RSA
EVP_chacha20_poly1305_draft ? 3_0_0 EXIST::FUNCTION:CHACHA,POLY1305
util/libssl.num
+1
View File
@@ -513,4 +513,5 @@ SSL_CTX_load_verify_dir ? 3_0_0 EXIST::FUNCTION:
SSL_CTX_load_verify_store ? 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_tlsext_ticket_key_evp_cb ? 3_0_0 EXIST::FUNCTION:
SSL_CTX_new_with_libctx ? 3_0_0 EXIST::FUNCTION:
SSL_new_session_ticket ? 3_0_0 EXIST::FUNCTION:
SSL_CTX_set_timeout_tls13 ? 3_0_0 EXIST::FUNCTION:
util/markdownlint.rb
+20
View File
@@ -0,0 +1,20 @@
# markdownlint style rules for OpenSSL
# See https://github.com/markdownlint/markdownlint/blob/master/docs/RULES.md
all
# Use --- and === for H1 and H2.
rule 'MD003', :style => :setext_with_atx
# Code blocks are indented
rule 'MD046', :style => :indented
# Bug in mdl, https://github.com/markdownlint/markdownlint/issues/313
exclude_rule 'MD007'
exclude_rule 'MD004' # Unordered list style TODO(fix?)
exclude_rule 'MD005' # Inconsistent indentation for list items at the same level
exclude_rule 'MD006' # Consider starting bulleted lists at the beginning of the line
exclude_rule 'MD014' # Dollar signs used before commands without showing output
exclude_rule 'MD024' # Multiple headers with the same content
exclude_rule 'MD025' # Multiple top level headers in the same document
exclude_rule 'MD029' # Ordered list item prefix
util/missingcrypto.txt
-3
View File
@@ -49,9 +49,7 @@ ASN1_IA5STRING_it(3)
ASN1_IA5STRING_new(3)
ASN1_INTEGER_cmp(3)
ASN1_INTEGER_dup(3)
ASN1_INTEGER_free(3)
ASN1_INTEGER_it(3)
ASN1_INTEGER_new(3)
ASN1_NULL_free(3)
ASN1_NULL_it(3)
ASN1_NULL_new(3)
@@ -314,7 +312,6 @@ CMS_ContentInfo_it(3)
CMS_EncryptedData_decrypt(3)
CMS_EncryptedData_encrypt(3)
CMS_EncryptedData_set1_key(3)
CMS_EnvelopedData_create(3)
CMS_ReceiptRequest_it(3)
CMS_RecipientEncryptedKey_cert_cmp(3)
CMS_RecipientEncryptedKey_get0_id(3)
util/missingmacro.txt
+5
View File
@@ -124,6 +124,11 @@ PKCS7_get_detached(3)
PKCS7_is_detached(3)
STACK_OF(3)
SKM_DEFINE_STACK_OF(3)
DEFINE_OR_DECLARE_STACK_OF(3)
DEFINE_OR_DECLARE_STACK_OF_STRING(3)
DEFINE_OR_DECLARE_STACK_OF_CSTRING(3)
DEFINE_STACK_OF_STRING(3)
DEFINE_STACK_OF_CSTRING(3)
U64(3)
SSL_set_mtu(3)
DTLS_set_link_mtu(3)
util/mkrc.pl
+2 -2
View File
@@ -1,5 +1,5 @@
#! /usr/bin/env perl
# Copyright 2006-2018 The OpenSSL Project Authors. All Rights Reserved.
# Copyright 2006-2020 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
@@ -25,7 +25,7 @@ if ( $filename =~ /openssl/i ) {
$vft = "VFT_APP";
}
my $YEAR = [localtime()]->[5] + 1900;
my $YEAR = [gmtime($ENV{SOURCE_DATE_EPOCH} || time())]->[5] + 1900;
print <<___;
#include <winver.h>
util/other.syms
+1
View File
@@ -49,6 +49,7 @@ OSSL_STORE_INFO datatype
OSSL_STORE_LOADER datatype
OSSL_STORE_LOADER_CTX datatype
OSSL_STORE_SEARCH datatype
OSSL_STORE_attach_fn datatype
OSSL_STORE_close_fn datatype
OSSL_STORE_ctrl_fn datatype
OSSL_STORE_expect_fn datatype
util/perl/OpenSSL/OID.pm
-85
View File
@@ -304,89 +304,4 @@ sub _pairmap (&@) {
map { $block->($_) } _pairs @_;
}
######## UNIT TESTING
use Test::More;
sub TEST {
# Order is important, so we make it a pairwise list
my @predefined =
(
'pkcs' => '1.2.840.113549',
'pkcs-1' => 'pkcs.1',
);
my %good_cases =
(
' 1.2.840.113549.1.1 ' => [ 42, 134, 72, 134, 247, 13, 1, 1 ],
'pkcs.1.1' => [ 42, 134, 72, 134, 247, 13, 1, 1 ],
'pkcs-1.1' => [ 42, 134, 72, 134, 247, 13, 1, 1 ],
' { iso (1) 2 840 113549 1 1 } ' => [ 42, 134, 72, 134, 247, 13, 1, 1 ],
'{ pkcs 1 1 } ' => [ 42, 134, 72, 134, 247, 13, 1, 1 ],
'{pkcs-1 1 }' => [ 42, 134, 72, 134, 247, 13, 1, 1 ],
);
my @bad_cases =
(
' { 1.2.840.113549.1.1 } ',
);
plan tests =>
scalar ( @predefined ) / 2
+ scalar ( keys %good_cases )
+ scalar @bad_cases;
note 'Predefine a few names OIDs';
foreach my $pair ( _pairs @predefined ) {
ok( defined eval { register_oid(@$pair) },
"Registering $pair->[0] => $pair->[1]" );
}
note 'Good cases';
foreach ( keys %good_cases ) {
subtest "Checking '$_'" => sub {
my $oid = shift;
plan tests => 5;
my (@l, @e);
ok( scalar (@l = eval { parse_oid $oid }) > 0,
"Parsing" );
diag $@ unless @l;
ok( scalar (@e = eval { encode_oid_nums @l }) > 0,
"Encoding via encode_oid_nums()" );
diag $@ unless @e;
is_deeply(\@e, $good_cases{$oid}, "Checking encoding");
note "'$oid' => ", join(', ', @e) if @e;
ok( scalar (@e = eval { encode_oid $oid }) > 0,
"Encoding directly" );
diag $@ unless @e;
is_deeply(\@e, $good_cases{$oid}, "Checking encoding");
note "'$oid' => ", join(', ', @e) if @e;
},
$_;
}
note 'Bad cases';
foreach ( @bad_cases ) {
subtest "Checking '$_'" => sub {
my $oid = shift;
plan tests => 2;
my (@l, @e);
ok( scalar (@l = eval { parse_oid $oid }) == 0,
"Parsing '$oid'" );
note $@ unless @l;
ok( scalar (@e = eval { encode_oid_nums @l }) == 0,
"Encoding '$oid'" );
note $@ unless @e;
note "'$oid' => ", join(', ', @e) if @e;
},
$_;
}
}
1; # End of OpenSSL::OID
util/perl/OpenSSL/ParseC.pm
+23 -1
View File
@@ -1,5 +1,5 @@
#! /usr/bin/env perl
# Copyright 2018 The OpenSSL Project Authors. All Rights Reserved.
# Copyright 2018-2020 The OpenSSL Project Authors. All Rights Reserved.
#
# Licensed under the Apache License 2.0 (the "License"). You may not use
# this file except in compliance with the License. You can obtain a copy
@@ -372,6 +372,28 @@ EOF
{ regexp => qr/DEFINE_STACK_OF_CONST<<<\((.*)\)>>>/,
massager => sub { return ("SKM_DEFINE_STACK_OF($1,const $1,$1)"); },
},
{ regexp => qr/DEFINE_STACK_OF_STRING<<<\((.*?)\)>>>/,
massager => sub {
return ("DEFINE_SPECIAL_STACK_OF(OPENSSL_STRING, char)");
}
},
{ regexp => qr/DEFINE_STACK_OF_CSTRING<<<\((.*?)\)>>>/,
massager => sub {
return ("DEFINE_SPECIAL_STACK_OF_CONST(OPENSSL_CSTRING, char)");
}
},
# DEFINE_OR_DECLARE macro calls must be interpretted as DEFINE macro
# calls, because that's what they look like to the external apps.
# (if that ever changes, we must change the substitutions to STACK_OF)
{ regexp => qr/DEFINE_OR_DECLARE_STACK_OF<<<\((.*?)\)>>>/,
massager => sub { return ("DEFINE_STACK_OF($1)"); }
},
{ regexp => qr/DEFINE_OR_DECLARE_STACK_OF_STRING<<<\(\)>>>/,
massager => sub { return ("DEFINE_STACK_OF_STRING()"); },
},
{ regexp => qr/DEFINE_OR_DECLARE_STACK_OF_CSTRING<<<\(\)>>>/,
massager => sub { return ("DEFINE_STACK_OF_CSTRING()"); },
},
#####
# ASN1 stuff