File 0435-public_key-export_all-export.patch of Package erlang
From 21fbe1747a4a799f06b6319147694c0d97510313 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Mon, 22 Jun 2020 10:34:39 +0200
Subject: [PATCH] public_key: export_all -> export
---
lib/public_key/test/erl_make_certs.erl | 6 +-
lib/public_key/test/pbe_SUITE.erl | 23 +++-
lib/public_key/test/pkits_SUITE.erl | 158 ++++++++++++++++++++++-
lib/public_key/test/pubkey_ssh_SUITE.erl | 35 ++++-
lib/public_key/test/public_key_SUITE.erl | 92 ++++++++++++-
5 files changed, 304 insertions(+), 10 deletions(-)
diff --git a/lib/public_key/test/erl_make_certs.erl b/lib/public_key/test/erl_make_certs.erl
index e772ea1734..4c0b60d543 100644
--- a/lib/public_key/test/erl_make_certs.erl
+++ b/lib/public_key/test/erl_make_certs.erl
@@ -23,8 +23,10 @@
-module(erl_make_certs).
-include_lib("public_key/include/public_key.hrl").
--export([make_cert/1, gen_rsa/1, verify_signature/3, write_pem/3]).
--compile(export_all).
+-export([make_cert/1, gen_rsa/1, verify_signature/3, write_pem/3,
+ gen_dsa/2, gen_ec/1,
+ pem_to_der/1, der_to_pem/2
+ ]).
%%--------------------------------------------------------------------
%% @doc Create and return a der encoded certificate
diff --git a/lib/public_key/test/pbe_SUITE.erl b/lib/public_key/test/pbe_SUITE.erl
index 2120c33079..4745698293 100644
--- a/lib/public_key/test/pbe_SUITE.erl
+++ b/lib/public_key/test/pbe_SUITE.erl
@@ -23,8 +23,27 @@
-include_lib("common_test/include/ct.hrl").
-include_lib("public_key/include/public_key.hrl").
-%% Note: This directive should only be used in test suites.
--compile(export_all).
+-export([
+ suite/0,
+ all/0,
+ groups/0,
+ init_per_suite/1,
+ end_per_suite/1,
+ init_per_group/2,
+ end_per_group/2,
+ init_per_testcase/2,
+ end_per_testcase/2,
+ pbdkdf1/0,
+ pbdkdf1/1,
+ pbdkdf2/0,
+ pbdkdf2/1,
+ old_pbe/0,
+ old_pbe/1,
+ pbes1/0,
+ pbes1/1,
+ pbes2/0,
+ pbes2/1
+ ]).
%%--------------------------------------------------------------------
%% Common Test interface functions -----------------------------------
diff --git a/lib/public_key/test/pkits_SUITE.erl b/lib/public_key/test/pkits_SUITE.erl
index 9ddd642d45..3b08dfc727 100644
--- a/lib/public_key/test/pkits_SUITE.erl
+++ b/lib/public_key/test/pkits_SUITE.erl
@@ -26,10 +26,164 @@
-include_lib("public_key/include/public_key.hrl").
-%% Note: This directive should only be used in test suites.
--compile(export_all).
+-export([
+ %% CT callbaks:
+ suite/0,
+ all/0,
+ groups/0,
+ init_per_suite/1,
+ end_per_suite/1,
+ init_per_group/2,
+ end_per_group/2,
+ init_per_testcase/2,
+ end_per_testcase/2,
+
+ %% Test cases:
+ attrib_name_chain/1,
+ attrib_name_chain/0,
+ basic_invalid/1,
+ basic_invalid/0,
+ basic_valid/1,
+ basic_valid/0,
+ capitalization_name_chain/1,
+ capitalization_name_chain/0,
+ crl_signing_invalid/1,
+ crl_signing_invalid/0,
+ crl_signing_valid/1,
+ crl_signing_valid/0,
+ delta_without_crl/1,
+ delta_without_crl/0,
+ fresh_CRL/1,
+ fresh_CRL/0,
+ invalid_CRL/1,
+ invalid_CRL/0,
+ invalid_CRL_issuer/1,
+ invalid_CRL_issuer/0,
+ invalid_CRL_signature/1,
+ invalid_CRL_signature/0,
+ invalid_DN_and_rfc822_name_constraints/1,
+ invalid_DN_and_rfc822_name_constraints/0,
+ invalid_DN_name_constraints/1,
+ invalid_DN_name_constraints/0,
+ invalid_crl_issuer/1,
+ invalid_crl_issuer/0,
+ invalid_delta_crls/1,
+ invalid_delta_crls/0,
+ invalid_distribution_points/1,
+ invalid_distribution_points/0,
+ invalid_dns_name_constraints/1,
+ invalid_dns_name_constraints/0,
+ invalid_dsa_signature/1,
+ invalid_dsa_signature/0,
+ invalid_indirect_crl/1,
+ invalid_indirect_crl/0,
+ invalid_key_usage/1,
+ invalid_key_usage/0,
+ invalid_name_chain/1,
+ invalid_name_chain/0,
+ invalid_only_contains/1,
+ invalid_only_contains/0,
+ invalid_only_some_reasons/1,
+ invalid_only_some_reasons/0,
+ invalid_path_constraints/1,
+ invalid_path_constraints/0,
+ invalid_rfc822_name_constraints/1,
+ invalid_rfc822_name_constraints/0,
+ invalid_rsa_signature/1,
+ invalid_rsa_signature/0,
+ invalid_separate_keys/1,
+ invalid_separate_keys/0,
+ invalid_serial/1,
+ invalid_serial/0,
+ invalid_uri_name_constraints/1,
+ invalid_uri_name_constraints/0,
+ missing_CRL/1,
+ missing_CRL/0,
+ missing_basic_constraints/1,
+ missing_basic_constraints/0,
+ not_after_invalid/1,
+ not_after_invalid/0,
+ not_after_valid/1,
+ not_after_valid/0,
+ not_before_invalid/1,
+ not_before_invalid/0,
+ not_before_valid/1,
+ not_before_valid/0,
+ old_CRL/1,
+ old_CRL/0,
+ revoked_CA/1,
+ revoked_CA/0,
+ revoked_peer/1,
+ revoked_peer/0,
+ string_name_chain/1,
+ string_name_chain/0,
+ uid_name_chain/1,
+ uid_name_chain/0,
+ unknown_CRL_extension/1,
+ unknown_CRL_extension/0,
+ unknown_critical_extension/1,
+ unknown_critical_extension/0,
+ unknown_not_critical_extension/1,
+ unknown_not_critical_extension/0,
+ valid_CRL/1,
+ valid_CRL/0,
+ valid_DN_and_rfc822_name_constraints/1,
+ valid_DN_and_rfc822_name_constraints/0,
+ valid_DN_name_constraints/1,
+ valid_DN_name_constraints/0,
+ valid_basic_constraint/1,
+ valid_basic_constraint/0,
+ valid_crl_issuer/1,
+ valid_crl_issuer/0,
+ valid_delta_crls/1,
+ valid_delta_crls/0,
+ valid_distribution_points/1,
+ valid_distribution_points/0,
+ valid_distribution_points_no_issuing_distribution_point/1,
+ valid_distribution_points_no_issuing_distribution_point/0,
+ valid_dns_name_constraints/1,
+ valid_dns_name_constraints/0,
+ valid_dsa_signature/1,
+ valid_dsa_signature/0,
+ valid_indirect_crl/1,
+ valid_indirect_crl/0,
+ valid_key_usage/1,
+ valid_key_usage/0,
+ valid_only_contains/1,
+ valid_only_contains/0,
+ valid_only_some_reasons/1,
+ valid_only_some_reasons/0,
+ valid_path_constraints/1,
+ valid_path_constraints/0,
+ valid_rfc822_name_constraints/1,
+ valid_rfc822_name_constraints/0,
+ valid_rsa_signature/1,
+ valid_rsa_signature/0,
+ valid_seperate_keys/1,
+ valid_seperate_keys/0,
+ valid_serial/1,
+ valid_serial/0,
+ valid_uri_name_constraints/1,
+ valid_uri_name_constraints/0,
+ whitespace_name_chain/1,
+ whitespace_name_chain/0,
+
+ %% Marked as "Not supported yet":
+ certificate_policies/0,
+ certificate_policies/1,
+ require_explicit_policy/0,
+ require_explicit_policy/1,
+ policy_mappings/0,
+ policy_mappings/1,
+ inhibit_policy_mapping/0,
+ inhibit_policy_mapping/1,
+ inhibit_any_policy/0,
+ inhibit_any_policy/1
+ ]).
-define(error(Format,Args), error(Format,Args,?FILE,?LINE)).
+
+-export([warning/4]).
-define(warning(Format,Args), warning(Format,Args,?FILE,?LINE)).
-define(CERTS, "pkits/certs").
diff --git a/lib/public_key/test/pubkey_ssh_SUITE.erl b/lib/public_key/test/pubkey_ssh_SUITE.erl
index afa3741346..effaece8f2 100644
--- a/lib/public_key/test/pubkey_ssh_SUITE.erl
+++ b/lib/public_key/test/pubkey_ssh_SUITE.erl
@@ -24,8 +24,39 @@
-include_lib("common_test/include/ct.hrl").
-include_lib("public_key/include/public_key.hrl").
-%% Note: This directive should only be used in test suites.
--compile(export_all).
+-export([
+ suite/0,
+ all/0,
+ groups/0,
+ init_per_suite/1,
+ end_per_suite/1,
+ init_per_group/2,
+ end_per_group/2,
+ init_per_testcase/2,
+ end_per_testcase/2,
+
+ ssh_rsa_public_key/1,
+ ssh_dsa_public_key/1,
+ ssh_ecdsa_public_key/1,
+ ssh_rfc4716_rsa_comment/1,
+ ssh_rfc4716_dsa_comment/1,
+ ssh_rfc4716_rsa_subject/1,
+ ssh_known_hosts/1,
+ ssh1_known_hosts/1,
+ ssh_auth_keys/1,
+ ssh1_auth_keys/1,
+ ssh_openssh_public_key_with_comment/1,
+ ssh_openssh_public_key_long_header/1,
+
+ ssh_hostkey_fingerprint_md5_implicit/1,
+ ssh_hostkey_fingerprint_md5/1,
+ ssh_hostkey_fingerprint_sha/1,
+ ssh_hostkey_fingerprint_sha256/1,
+ ssh_hostkey_fingerprint_sha384/1,
+ ssh_hostkey_fingerprint_sha512/1,
+ ssh_hostkey_fingerprint_list/1
+ ]).
+
-define(TIMEOUT, 120000). % 2 min
diff --git a/lib/public_key/test/public_key_SUITE.erl b/lib/public_key/test/public_key_SUITE.erl
index 5e80523b45..438924375c 100644
--- a/lib/public_key/test/public_key_SUITE.erl
+++ b/lib/public_key/test/public_key_SUITE.erl
@@ -1,3 +1,4 @@
+
%%
%% %CopyrightBegin%
%%
@@ -24,8 +25,95 @@
-include_lib("common_test/include/ct.hrl").
-include_lib("public_key/include/public_key.hrl").
-%% Note: This directive should only be used in test suites.
--compile(export_all).
+-export([
+ suite/0,
+ all/0,
+ groups/0,
+ init_per_suite/1,
+ end_per_suite/1,
+ init_per_group/2,
+ end_per_group/2,
+ init_per_testcase/2,
+ init_common_per_testcase/1,
+ end_per_testcase/2,
+ app/0,
+ app/1,
+ appup/0,
+ appup/1,
+ dsa_pem/0,
+ dsa_pem/1,
+ dsa_priv_pkcs8/0,
+ dsa_priv_pkcs8/1,
+ rsa_pem/0,
+ rsa_pem/1,
+ rsa_pss_pss_pem/0,
+ rsa_pss_pss_pem/1,
+ rsa_priv_pkcs8/0,
+ rsa_priv_pkcs8/1,
+ ec_pem/0,
+ ec_pem/1,
+ ec_pem2/0,
+ ec_pem2/1,
+ ec_priv_pkcs8/0,
+ ec_priv_pkcs8/1,
+ init_ec_pem_encode_generated/1,
+ ec_pem_encode_generated/0,
+ ec_pem_encode_generated/1,
+ encrypted_pem/0,
+ encrypted_pem/1,
+ dh_pem/0,
+ dh_pem/1,
+ pkcs10_pem/0,
+ pkcs10_pem/1,
+ pkcs7_pem/0,
+ pkcs7_pem/1,
+ cert_pem/0,
+ cert_pem/1,
+ encrypt_decrypt/0,
+ encrypt_decrypt/1,
+ rsa_sign_verify/0,
+ rsa_sign_verify/1,
+ rsa_pss_sign_verify/0,
+ rsa_pss_sign_verify/1,
+ dsa_sign_verify/0,
+ dsa_sign_verify/1,
+ pkix/0,
+ pkix/1,
+ pkix_countryname/0,
+ pkix_countryname/1,
+ pkix_emailaddress/0,
+ pkix_emailaddress/1,
+ pkix_path_validation/0,
+ pkix_path_validation/1,
+ pkix_verify_hostname_cn/1,
+ pkix_verify_hostname_subjAltName/1,
+ pkix_verify_hostname_options/1,
+ pkix_verify_hostname_subjAltName_IP/1,
+ pkix_iso_rsa_oid/0,
+ pkix_iso_rsa_oid/1,
+ pkix_iso_dsa_oid/0,
+ pkix_iso_dsa_oid/1,
+ pkix_dsa_sha2_oid/0,
+ pkix_dsa_sha2_oid/1,
+ pkix_crl/0,
+ pkix_crl/1,
+ general_name/0,
+ general_name/1,
+ pkix_hash_type/0,
+ pkix_hash_type/1,
+ pkix_test_data_all_default/0,
+ pkix_test_data_all_default/1,
+ pkix_test_data/0,
+ pkix_test_data/1,
+ short_cert_issuer_hash/0,
+ short_cert_issuer_hash/1,
+ short_crl_issuer_hash/0,
+ short_crl_issuer_hash/1,
+ gen_ec_param_prime_field/0,
+ gen_ec_param_prime_field/1,
+ gen_ec_param_char_2_field/0,
+ gen_ec_param_char_2_field/1
+ ]).
-define(TIMEOUT, 120000). % 2 min
--
2.26.2
