CVSROOT:        /cvs
Module name:    src
Changes by:     t...@cvs.openbsd.org    2022/11/26 09:08:57

Modified files:
        lib/libcrypto/aes: aes_core.c aes_ecb.c aes_ige.c aes_misc.c 
                           aes_x86core.c 
        lib/libcrypto/asn1: a_enum.c a_mbstr.c a_object.c a_pkey.c 
                            a_pubkey.c a_strex.c a_string.c a_time.c 
                            a_time_tm.c a_utf8.c ameth_lib.c asn1_gen.c 
                            asn1_item.c asn1_old.c asn1_old_lib.c 
                            asn_mime.c asn_moid.c p5_pbev2.c p8_pkey.c 
                            t_crl.c t_pkey.c t_req.c t_spki.c t_x509.c 
                            t_x509a.c tasn_dec.c tasn_enc.c tasn_fre.c 
                            tasn_new.c tasn_prn.c x_attrib.c x_bignum.c 
                            x_crl.c x_exten.c x_long.c x_name.c 
                            x_pubkey.c x_req.c x_sig.c x_x509.c 
                            x_x509a.c 
        lib/libcrypto/bf: bf_cbc.c bf_cfb64.c bf_ecb.c bf_enc.c 
                          bf_ofb64.c bf_skey.c 
        lib/libcrypto/bn: bn_add.c bn_asm.c bn_blind.c bn_bpsw.c 
                          bn_ctx.c bn_depr.c bn_div.c bn_exp.c bn_exp2.c 
                          bn_gcd.c bn_gf2m.c bn_isqrt.c bn_kron.c 
                          bn_lib.c bn_mod.c bn_mont.c bn_mpi.c bn_mul.c 
                          bn_nist.c bn_prime.c bn_print.c bn_rand.c 
                          bn_recp.c bn_shift.c bn_sqr.c bn_sqrt.c 
                          bn_word.c bn_x931p.c 
        lib/libcrypto/bn/asm: x86_64-gcc.c 
        lib/libcrypto/camellia: camellia.c cmll_ecb.c cmll_misc.c 
        lib/libcrypto/cast: c_cfb64.c c_ecb.c c_enc.c c_ofb64.c c_skey.c 
        lib/libcrypto/cmac: cm_ameth.c cm_pmeth.c cmac.c 
        lib/libcrypto/cms: cms_asn1.c cms_att.c cms_cd.c cms_dd.c 
                           cms_enc.c cms_env.c cms_ess.c cms_io.c 
                           cms_kari.c cms_lib.c cms_pwri.c cms_sd.c 
                           cms_smime.c 
        lib/libcrypto/des: cbc_cksm.c cfb64ede.c cfb64enc.c cfb_enc.c 
                           des_enc.c ecb3_enc.c ecb_enc.c ede_cbcm_enc.c 
                           enc_read.c enc_writ.c fcrypt.c fcrypt_b.c 
                           ncbc_enc.c ofb64ede.c ofb64enc.c ofb_enc.c 
                           pcbc_enc.c qud_cksm.c set_key.c str2key.c 
                           xcbc_enc.c 
        lib/libcrypto/dh: dh_ameth.c dh_check.c dh_depr.c dh_key.c 
                          dh_pmeth.c 
        lib/libcrypto/dsa: dsa_ameth.c dsa_asn1.c dsa_depr.c dsa_gen.c 
                           dsa_key.c dsa_lib.c dsa_meth.c dsa_ossl.c 
                           dsa_pmeth.c dsa_sign.c dsa_vrf.c 
        lib/libcrypto/ec: ec2_mult.c ec2_oct.c ec2_smpl.c ec_ameth.c 
                          ec_asn1.c ec_check.c ec_curve.c ec_cvt.c 
                          ec_key.c ec_kmeth.c ec_lib.c ec_mult.c 
                          ec_oct.c ec_pmeth.c ec_print.c ecp_mont.c 
                          ecp_nist.c ecp_nistp224.c ecp_nistp256.c 
                          ecp_nistp521.c ecp_nistputil.c ecp_nistz256.c 
                          ecp_oct.c ecp_smpl.c ecx_methods.c 
        lib/libcrypto/ecdh: ecdh_kdf.c ech_key.c ech_lib.c 
        lib/libcrypto/ecdsa: ecs_asn1.c ecs_lib.c ecs_ossl.c ecs_sign.c 
                             ecs_vrf.c 
        lib/libcrypto/engine: eng_openssl.c tb_asnmth.c 
        lib/libcrypto/evp: bio_b64.c bio_enc.c bio_md.c digest.c e_aes.c 
                           e_aes_cbc_hmac_sha1.c e_bf.c e_camellia.c 
                           e_cast.c e_chacha.c e_chacha20poly1305.c 
                           e_des.c e_des3.c e_gost2814789.c e_idea.c 
                           e_null.c e_rc2.c e_rc4.c e_rc4_hmac_md5.c 
                           e_sm4.c e_xcbc_d.c encode.c evp_aead.c 
                           evp_enc.c evp_key.c evp_lib.c evp_pbe.c 
                           evp_pkey.c m_gost2814789.c m_gostr341194.c 
                           m_md4.c m_md5.c m_md5_sha1.c m_null.c 
                           m_ripemd.c m_sha1.c m_sigver.c m_sm3.c 
                           m_streebog.c m_wp.c names.c p5_crpt.c 
                           p5_crpt2.c p_dec.c p_enc.c p_lib.c p_open.c 
                           p_sign.c p_verify.c pmeth_fn.c pmeth_gn.c 
                           pmeth_lib.c 
        lib/libcrypto/gost: gost2814789.c gost89_keywrap.c 
                            gost89_params.c gost89imit_ameth.c 
                            gost89imit_pmeth.c gost_asn1.c gostr341001.c 
                            gostr341001_ameth.c gostr341001_key.c 
                            gostr341001_params.c gostr341001_pmeth.c 
                            gostr341194.c streebog.c 
        lib/libcrypto/hkdf: hkdf.c 
        lib/libcrypto/hmac: hm_ameth.c hm_pmeth.c hmac.c hmac_local.h 
        lib/libcrypto/idea: i_cbc.c i_cfb64.c i_ecb.c i_ofb64.c i_skey.c 
        lib/libcrypto/kdf: hkdf_evp.c 
        lib/libcrypto/md4: md4_dgst.c 
        lib/libcrypto/md5: md5_dgst.c 
        lib/libcrypto/modes: cbc128.c ccm128.c cfb128.c ctr128.c 
                             cts128.c gcm128.c ofb128.c xts128.c 
        lib/libcrypto/objects: obj_dat.c obj_lib.c 
        lib/libcrypto/ocsp: ocsp_ext.c ocsp_vfy.c 
        lib/libcrypto/pem: pem_info.c pem_lib.c pem_pkey.c pvkfmt.c 
        lib/libcrypto/pkcs12: p12_attr.c p12_decr.c p12_key.c p12_mutl.c 
                              p12_npas.c p12_p8d.c p12_p8e.c p12_sbag.c 
        lib/libcrypto/pkcs7: pk7_doit.c pk7_lib.c pk7_smime.c 
        lib/libcrypto/rc2: rc2_cbc.c rc2_ecb.c rc2_skey.c rc2cfb64.c 
                           rc2ofb64.c 
        lib/libcrypto/rc4: rc4_enc.c rc4_skey.c 
        lib/libcrypto/ripemd: rmd_dgst.c 
        lib/libcrypto/rsa: rsa_ameth.c rsa_asn1.c rsa_chk.c rsa_crpt.c 
                           rsa_depr.c rsa_eay.c rsa_gen.c rsa_lib.c 
                           rsa_meth.c rsa_oaep.c rsa_pmeth.c rsa_pss.c 
                           rsa_sign.c 
        lib/libcrypto/sha: sha1dgst.c 
        lib/libcrypto/sm2: sm2_crypt.c sm2_pmeth.c sm2_sign.c 
        lib/libcrypto/sm3: sm3.c 
        lib/libcrypto/ts: ts_lib.c ts_rsp_sign.c ts_rsp_verify.c 
        lib/libcrypto/ui: ui_lib.c ui_openssl.c ui_util.c 
        lib/libcrypto/whrlpool: wp_block.c wp_dgst.c 
        lib/libcrypto/x509: by_dir.c by_file.c by_mem.c pcy_cache.c 
                            pcy_map.c pcy_tree.c x509_addr.c x509_asid.c 
                            x509_att.c x509_cmp.c x509_conf.c 
                            x509_cpols.c x509_crld.c x509_ext.c 
                            x509_internal.h x509_lib.c x509_lu.c 
                            x509_ncons.c x509_obj.c x509_prn.c 
                            x509_purp.c x509_r2x.c x509_req.c x509_set.c 
                            x509_skey.c x509_trs.c x509_v3.c x509_vfy.c 
                            x509_vpm.c x509cset.c x509name.c x509rset.c 
                            x509type.c x_all.c 
        lib/libssl     : bio_ssl.c d1_both.c d1_lib.c d1_pkt.c d1_srtp.c 
                         s3_cbc.c s3_lib.c ssl_algs.c ssl_asn1.c 
                         ssl_both.c ssl_cert.c ssl_ciph.c ssl_ciphers.c 
                         ssl_clnt.c ssl_err.c ssl_init.c ssl_lib.c 
                         ssl_methods.c ssl_packet.c ssl_pkt.c ssl_rsa.c 
                         ssl_seclevel.c ssl_sess.c ssl_sigalgs.c 
                         ssl_srvr.c ssl_stat.c ssl_tlsext.c 
                         ssl_transcript.c ssl_txt.c ssl_versions.c 
                         t1_enc.c t1_lib.c tls12_key_schedule.c 
                         tls12_lib.c tls12_record_layer.c tls13_client.c 
                         tls13_handshake.c tls13_key_schedule.c 
                         tls13_legacy.c tls13_lib.c tls13_quic.c 
                         tls13_server.c tls_key_share.c tls_lib.c 
        regress/lib/libcrypto/asn1: asn1basic.c asn1object.c 
        regress/lib/libcrypto/bn/general: bn_isqrt.c 
        regress/lib/libcrypto/evp: evp_pkey_cleanup.c evp_test.c 
        regress/lib/libcrypto/sm2: sm2crypttest.c sm2sigtest.c 
        regress/lib/libcrypto/utf8: utf8test.c 
        regress/lib/libssl/asn1: asn1test.c 
        regress/lib/libssl/dtls: dtlstest.c 
        regress/lib/libssl/exporter: exportertest.c 
        regress/lib/libssl/key_schedule: key_schedule.c 
        regress/lib/libssl/record_layer: record_layer_test.c 
        regress/lib/libssl/ssl: ssltest.c 
        regress/lib/libssl/tlsext: tlsexttest.c 
        regress/lib/libssl/unit: cipher_list.c ssl_versions.c 
                                 tls_ext_alpn.c tls_prf.c 
Added files:
        lib/libcrypto  : constant_time.h 
        lib/libcrypto/aes: aes_local.h 
        lib/libcrypto/asn1: asn1_local.h 
        lib/libcrypto/bf: bf_local.h 
        lib/libcrypto/bn: bn_local.h 
        lib/libcrypto/camellia: cmll_local.h 
        lib/libcrypto/cast: cast_local.h 
        lib/libcrypto/cms: cms_local.h 
        lib/libcrypto/des: des_local.h 
        lib/libcrypto/dsa: dsa_local.h 
        lib/libcrypto/ec: ec_local.h 
        lib/libcrypto/ecdh: ech_local.h 
        lib/libcrypto/ecdsa: ecs_local.h 
        lib/libcrypto/evp: evp_local.h 
        lib/libcrypto/gost: gost_local.h 
        lib/libcrypto/idea: idea_local.h 
        lib/libcrypto/md4: md4_local.h 
        lib/libcrypto/md5: md5_local.h 
        lib/libcrypto/modes: modes_local.h 
        lib/libcrypto/rc2: rc2_local.h 
        lib/libcrypto/rc4: rc4_local.h 
        lib/libcrypto/ripemd: rmd_local.h 
        lib/libcrypto/rsa: rsa_local.h 
        lib/libcrypto/sha: sha_local.h 
        lib/libcrypto/sm2: sm2_local.h 
        lib/libcrypto/sm3: sm3_local.h 
        lib/libcrypto/ui: ui_local.h 
        lib/libcrypto/whrlpool: wp_local.h 
        lib/libcrypto/x509: x509_local.h 
        lib/libssl     : dtls_local.h ssl_local.h 
Removed files:
        lib/libcrypto  : constant_time_locl.h 
        lib/libcrypto/aes: aes_locl.h 
        lib/libcrypto/asn1: asn1_locl.h 
        lib/libcrypto/bf: bf_locl.h 
        lib/libcrypto/camellia: cmll_locl.h 
        lib/libcrypto/cast: cast_lcl.h 
        lib/libcrypto/cms: cms_lcl.h 
        lib/libcrypto/des: des_locl.h 
        lib/libcrypto/dsa: dsa_locl.h 
        lib/libcrypto/ec: ec_lcl.h 
        lib/libcrypto/ecdh: ech_locl.h 
        lib/libcrypto/ecdsa: ecs_locl.h 
        lib/libcrypto/evp: evp_locl.h 
        lib/libcrypto/gost: gost_locl.h 
        lib/libcrypto/idea: idea_lcl.h 
        lib/libcrypto/md4: md4_locl.h 
        lib/libcrypto/md5: md5_locl.h 
        lib/libcrypto/modes: modes_lcl.h 
        lib/libcrypto/rc2: rc2_locl.h 
        lib/libcrypto/rc4: rc4_locl.h 
        lib/libcrypto/ripemd: rmd_locl.h 
        lib/libcrypto/rsa: rsa_locl.h 
        lib/libcrypto/sha: sha_locl.h 
        lib/libcrypto/sm2: sm2_locl.h 
        lib/libcrypto/sm3: sm3_locl.h 
        lib/libcrypto/ui: ui_locl.h 
        lib/libcrypto/whrlpool: wp_locl.h 
        lib/libcrypto/x509: x509_lcl.h 
        lib/libssl     : dtls_locl.h ssl_locl.h 

Log message:
Make internal header file names consistent

Libcrypto currently has a mess of *_lcl.h, *_locl.h, and *_local.h names
used for internal headers. Move all these headers we inherited from
OpenSSL to *_local.h, reserving the name *_internal.h for our own code.
Similarly, move dtls_locl.h and ssl_locl.h to dtls_local and ssl_local.h.
constant_time_locl.h is moved to constant_time.h since it's special.

Adjust all .c files in libcrypto, libssl and regress.

The diff is mechanical with the exception of tls13_quic.c, where
#include <ssl_locl.h> was fixed manually.

discussed with jsing,
no objection bcook

Reply via email to