CVS commit: src/lib/libm/man

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May  8 01:28:35 UTC 2023

Modified Files:
src/lib/libm/man: math.3

Log Message:
fix cross references (from Anon Ymous)


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/lib/libm/man/math.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libm/man/math.3
diff -u src/lib/libm/man/math.3:1.28 src/lib/libm/man/math.3:1.29
--- src/lib/libm/man/math.3:1.28	Thu Sep 28 07:18:41 2017
+++ src/lib/libm/man/math.3	Sun May  7 21:28:35 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: math.3,v 1.28 2017/09/28 11:18:41 maya Exp $
+.\"	$NetBSD: math.3,v 1.29 2023/05/08 01:28:35 christos Exp $
 .\"
 .\" Copyright (c) 1985 Regents of the University of California.
 .\" All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)math.3	6.10 (Berkeley) 5/6/91
 .\"
-.Dd September 28, 2017
+.Dd May 7, 2023
 .Dt MATH 3
 .Os
 .Sh NAME
@@ -66,10 +66,10 @@ Declarations for these functions may be 
 .It exp2 Ta Xr exp2 3 Ta base 2 exponential Ta ???
 .It expm1 Ta Xr expm1 3 Ta exp(x)\-1 Ta 1
 .It fabs Ta Xr fabs 3 Ta absolute value Ta 0
-.It fdim Ta Xr erf 3 Ta positive difference Ta ???
+.It fdim Ta Xr fdim 3 Ta positive difference Ta ???
 .It finite Ta Xr finite 3 Ta test for finity Ta 0
 .It floor Ta Xr floor 3 Ta integer no greater than Ta 0
-.It fma Ta Xr fmod 3 Ta fused multiply-add Ta ???
+.It fma Ta Xr fma 3 Ta fused multiply-add Ta ???
 .It fmax Ta Xr fmax 3 Ta maximum Ta 0
 .It fmin Ta Xr fmin 3 Ta minimum Ta 0
 .It fmod Ta Xr fmod 3 Ta remainder Ta ???



CVS commit: src/lib/libm/man

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May  8 01:28:35 UTC 2023

Modified Files:
src/lib/libm/man: math.3

Log Message:
fix cross references (from Anon Ymous)


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/lib/libm/man/math.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/share/man/man8/man8.x86

2023-05-07 Thread Emmanuel Dreyfus
Module Name:src
Committed By:   manu
Date:   Mon May  8 00:40:50 UTC 2023

Modified Files:
src/share/man/man8/man8.x86: boot.8

Log Message:
Remove XXX todo marker left by mistake


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/share/man/man8/man8.x86/boot.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man8/man8.x86/boot.8
diff -u src/share/man/man8/man8.x86/boot.8:1.28 src/share/man/man8/man8.x86/boot.8:1.29
--- src/share/man/man8/man8.x86/boot.8:1.28	Fri May  5 00:34:40 2023
+++ src/share/man/man8/man8.x86/boot.8	Mon May  8 00:40:50 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: boot.8,v 1.28 2023/05/05 00:34:40 manu Exp $
+.\"	$NetBSD: boot.8,v 1.29 2023/05/08 00:40:50 manu Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -701,7 +701,7 @@ and may impact system security.
 Pass an explicit root specification to the kernel.
 See BTINFO_ROOTDEVICE for details.
 .It Ic splash Ar file
-[Only available for BIOS and UEFI boot] XXX document
+[Only available for BIOS and UEFI boot]
 Load a graphical image from the specified
 .Ar file
 and request the kernel to use it as a splash screen.



CVS commit: src/share/man/man8/man8.x86

2023-05-07 Thread Emmanuel Dreyfus
Module Name:src
Committed By:   manu
Date:   Mon May  8 00:40:50 UTC 2023

Modified Files:
src/share/man/man8/man8.x86: boot.8

Log Message:
Remove XXX todo marker left by mistake


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/share/man/man8/man8.x86/boot.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/share/mk

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 23:24:51 UTC 2023

Modified Files:
src/share/mk: bsd.prog.mk

Log Message:
Provide a hook to link in libraries statically in PROGDPLIBS.
OpenSSL protects the symbols in the shared object via a linker
script, but programs and tests need those protected symbols, so
they either must link against the archive, or I need to expose the
symbols. For now, I chose to expose the symbols.  Note that we
cannot use -Bstatic -Lpath -llibrary -Bdynamic because this seems
to be broken with collect2 and so we use the path directly.


To generate a diff of this commit:
cvs rdiff -u -r1.341 -r1.342 src/share/mk/bsd.prog.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/share/mk

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 23:24:51 UTC 2023

Modified Files:
src/share/mk: bsd.prog.mk

Log Message:
Provide a hook to link in libraries statically in PROGDPLIBS.
OpenSSL protects the symbols in the shared object via a linker
script, but programs and tests need those protected symbols, so
they either must link against the archive, or I need to expose the
symbols. For now, I chose to expose the symbols.  Note that we
cannot use -Bstatic -Lpath -llibrary -Bdynamic because this seems
to be broken with collect2 and so we use the path directly.


To generate a diff of this commit:
cvs rdiff -u -r1.341 -r1.342 src/share/mk/bsd.prog.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.341 src/share/mk/bsd.prog.mk:1.342
--- src/share/mk/bsd.prog.mk:1.341	Wed Jul 13 23:48:49 2022
+++ src/share/mk/bsd.prog.mk	Sun May  7 19:24:51 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.341 2022/07/14 03:48:49 mrg Exp $
+#	$NetBSD: bsd.prog.mk,v 1.342 2023/05/07 23:24:51 christos Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -404,7 +404,11 @@ PROGS=		${PROG}
 PROGDO.${_lib}!=	cd "${_dir}" && ${PRINTOBJDIR}
 .MAKEOVERRIDES+=PROGDO.${_lib}
 .endif
-LDADD+=		-L${PROGDO.${_lib}} -l${_lib}
+.if defined(PROGDPLIBSSTATIC)
+DPADD+=		${PROGDO.${_lib}}/lib${_lib}.a
+LDADD+=		${PROGDO.${_lib}}/lib${_lib}.a
+.else
+LDADD+=		${PROGDPLIBBEGIN} -L${PROGDO.${_lib}} -l${_lib} ${PROGDPLIBEND}
 .if exists(${PROGDO.${_lib}}/lib${_lib}_pic.a)
 DPADD+=		${PROGDO.${_lib}}/lib${_lib}_pic.a
 .elif exists(${PROGDO.${_lib}}/lib${_lib}.so)
@@ -412,6 +416,7 @@ DPADD+=		${PROGDO.${_lib}}/lib${_lib}.so
 .else
 DPADD+=		${PROGDO.${_lib}}/lib${_lib}.a
 .endif
+.endif
 .endfor
 .endif	# }
 #



CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 20:06:22 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: man.inc
src/crypto/external/bsd/openssl/lib/libcrypto/man: ADMISSIONS.3
ASN1_INTEGER_get_int64.3 ASN1_ITEM_lookup.3 ASN1_OBJECT_new.3
ASN1_STRING_TABLE_add.3 ASN1_STRING_length.3 ASN1_STRING_new.3
ASN1_STRING_print_ex.3 ASN1_TIME_set.3 ASN1_TYPE_get.3
ASN1_generate_nconf.3 ASYNC_WAIT_CTX_new.3 ASYNC_start_job.3
BF_encrypt.3 BIO_ADDR.3 BIO_ADDRINFO.3 BIO_connect.3 BIO_ctrl.3
BIO_f_base64.3 BIO_f_buffer.3 BIO_f_cipher.3 BIO_f_md.3
BIO_f_null.3 BIO_f_ssl.3 BIO_find_type.3 BIO_get_data.3
BIO_get_ex_new_index.3 BIO_meth_new.3 BIO_new.3 BIO_new_CMS.3
BIO_parse_hostserv.3 BIO_printf.3 BIO_push.3 BIO_read.3
BIO_s_accept.3 BIO_s_bio.3 BIO_s_connect.3 BIO_s_fd.3 BIO_s_file.3
BIO_s_mem.3 BIO_s_null.3 BIO_s_socket.3 BIO_set_callback.3
BIO_should_retry.3 BN_BLINDING_new.3 BN_CTX_new.3 BN_CTX_start.3
BN_add.3 BN_add_word.3 BN_bn2bin.3 BN_cmp.3 BN_copy.3
BN_generate_prime.3 BN_mod_inverse.3 BN_mod_mul_montgomery.3
BN_mod_mul_reciprocal.3 BN_new.3 BN_num_bytes.3 BN_rand.3
BN_security_bits.3 BN_set_bit.3 BN_swap.3 BN_zero.3 BUF_MEM_new.3
CMS_add0_cert.3 CMS_add1_recipient_cert.3 CMS_add1_signer.3
CMS_compress.3 CMS_decrypt.3 CMS_encrypt.3 CMS_final.3
CMS_get0_RecipientInfos.3 CMS_get0_SignerInfos.3 CMS_get0_type.3
CMS_get1_ReceiptRequest.3 CMS_sign.3 CMS_sign_receipt.3
CMS_uncompress.3 CMS_verify.3 CMS_verify_receipt.3
CONF_modules_free.3 CONF_modules_load_file.3
CRYPTO_THREAD_run_once.3 CRYPTO_get_ex_new_index.3
CTLOG_STORE_get0_log_by_id.3 CTLOG_STORE_new.3 CTLOG_new.3
CT_POLICY_EVAL_CTX_new.3 DEFINE_STACK_OF.3 DES_random_key.3
DH_generate_key.3 DH_generate_parameters.3 DH_get0_pqg.3
DH_get_1024_160.3 DH_meth_new.3 DH_new.3 DH_new_by_nid.3
DH_set_method.3 DH_size.3 DSA_SIG_new.3 DSA_do_sign.3 DSA_dup_DH.3
DSA_generate_key.3 DSA_generate_parameters.3 DSA_get0_pqg.3
DSA_meth_new.3 DSA_new.3 DSA_set_method.3 DSA_sign.3 DSA_size.3
DTLS_get_data_mtu.3 DTLS_set_timer_cb.3 DTLSv1_listen.3
ECDSA_SIG_new.3 ECPKParameters_print.3 EC_GFp_simple_method.3
EC_GROUP_copy.3 EC_GROUP_new.3 EC_KEY_get_enc_flags.3 EC_KEY_new.3
EC_POINT_add.3 EC_POINT_new.3 ENGINE_add.3 ERR_GET_LIB.3
ERR_clear_error.3 ERR_error_string.3 ERR_get_error.3
ERR_load_crypto_strings.3 ERR_load_strings.3 ERR_print_errors.3
ERR_put_error.3 ERR_remove_state.3 ERR_set_mark.3 EVP_BytesToKey.3
EVP_CIPHER_CTX_get_cipher_data.3 EVP_CIPHER_meth_new.3
EVP_DigestInit.3 EVP_DigestSignInit.3 EVP_DigestVerifyInit.3
EVP_EncodeInit.3 EVP_EncryptInit.3 EVP_MD_meth_new.3 EVP_OpenInit.3
EVP_PKEY_ASN1_METHOD.3 EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_new.3
EVP_PKEY_CTX_set1_pbe_pass.3 EVP_PKEY_CTX_set_hkdf_md.3
EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 EVP_PKEY_CTX_set_scrypt_N.3
EVP_PKEY_CTX_set_tls1_prf_md.3 EVP_PKEY_asn1_get_count.3
EVP_PKEY_decrypt.3 EVP_PKEY_derive.3 EVP_PKEY_encrypt.3
EVP_PKEY_get_default_digest_nid.3 EVP_PKEY_keygen.3
EVP_PKEY_meth_get_count.3 EVP_PKEY_meth_new.3 EVP_PKEY_new.3
EVP_PKEY_print_private.3 EVP_PKEY_set1_RSA.3 EVP_PKEY_sign.3
EVP_PKEY_verify.3 EVP_PKEY_verify_recover.3 EVP_SealInit.3
EVP_SignInit.3 EVP_VerifyInit.3 EVP_bf_cbc.3 EVP_blake2b512.3
EVP_cast5_cbc.3 EVP_chacha20.3 EVP_desx_cbc.3 EVP_idea_cbc.3
EVP_md2.3 EVP_md4.3 EVP_md5.3 EVP_mdc2.3 EVP_rc2_cbc.3 EVP_rc4.3
EVP_rc5_32_12_16_cbc.3 EVP_ripemd160.3 EVP_seed_cbc.3 EVP_sha1.3
EVP_sha224.3 EVP_sha3_224.3 EVP_sm3.3 EVP_sm4_cbc.3 EVP_whirlpool.3
HMAC.3 MD5.3 MDC2_Init.3 Makefile OBJ_nid2obj.3 OCSP_REQUEST_new.3
OCSP_cert_to_id.3 OCSP_request_add1_nonce.3 OCSP_resp_find_status.3
OCSP_response_status.3 OCSP_sendreq_new.3 OPENSSL_Applink.3
OPENSSL_LH_COMPFUNC.3 OPENSSL_LH_stats.3 OPENSSL_config.3
OPENSSL_fork_prepare.3 OPENSSL_ia32cap.3 OPENSSL_init_crypto.3
OPENSSL_init_ssl.3 OPENSSL_instrument_bus.3
OPENSSL_load_builtin_modules.3 OPENSSL_malloc.3
OPENSSL_secure_malloc.3 OSSL_STORE_INFO.3 OSSL_STORE_LOADER.3
OSSL_STORE_SEARCH.3 OSSL_STORE_expect.3 OSSL_STORE_open.3
OpenSSL_add_all_algorithms.3 PEM_bytes_read_bio.3 PEM_read.3
PEM_read_CMS.3 PEM_read_bio_PrivateKey.3 PEM_read_bio_ex.3
PEM_write_bio_CMS_stream.3 PEM_write_bio_PKCS7_stream.3
PKCS12_create.3 

CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 20:06:22 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: man.inc
src/crypto/external/bsd/openssl/lib/libcrypto/man: ADMISSIONS.3
ASN1_INTEGER_get_int64.3 ASN1_ITEM_lookup.3 ASN1_OBJECT_new.3
ASN1_STRING_TABLE_add.3 ASN1_STRING_length.3 ASN1_STRING_new.3
ASN1_STRING_print_ex.3 ASN1_TIME_set.3 ASN1_TYPE_get.3
ASN1_generate_nconf.3 ASYNC_WAIT_CTX_new.3 ASYNC_start_job.3
BF_encrypt.3 BIO_ADDR.3 BIO_ADDRINFO.3 BIO_connect.3 BIO_ctrl.3
BIO_f_base64.3 BIO_f_buffer.3 BIO_f_cipher.3 BIO_f_md.3
BIO_f_null.3 BIO_f_ssl.3 BIO_find_type.3 BIO_get_data.3
BIO_get_ex_new_index.3 BIO_meth_new.3 BIO_new.3 BIO_new_CMS.3
BIO_parse_hostserv.3 BIO_printf.3 BIO_push.3 BIO_read.3
BIO_s_accept.3 BIO_s_bio.3 BIO_s_connect.3 BIO_s_fd.3 BIO_s_file.3
BIO_s_mem.3 BIO_s_null.3 BIO_s_socket.3 BIO_set_callback.3
BIO_should_retry.3 BN_BLINDING_new.3 BN_CTX_new.3 BN_CTX_start.3
BN_add.3 BN_add_word.3 BN_bn2bin.3 BN_cmp.3 BN_copy.3
BN_generate_prime.3 BN_mod_inverse.3 BN_mod_mul_montgomery.3
BN_mod_mul_reciprocal.3 BN_new.3 BN_num_bytes.3 BN_rand.3
BN_security_bits.3 BN_set_bit.3 BN_swap.3 BN_zero.3 BUF_MEM_new.3
CMS_add0_cert.3 CMS_add1_recipient_cert.3 CMS_add1_signer.3
CMS_compress.3 CMS_decrypt.3 CMS_encrypt.3 CMS_final.3
CMS_get0_RecipientInfos.3 CMS_get0_SignerInfos.3 CMS_get0_type.3
CMS_get1_ReceiptRequest.3 CMS_sign.3 CMS_sign_receipt.3
CMS_uncompress.3 CMS_verify.3 CMS_verify_receipt.3
CONF_modules_free.3 CONF_modules_load_file.3
CRYPTO_THREAD_run_once.3 CRYPTO_get_ex_new_index.3
CTLOG_STORE_get0_log_by_id.3 CTLOG_STORE_new.3 CTLOG_new.3
CT_POLICY_EVAL_CTX_new.3 DEFINE_STACK_OF.3 DES_random_key.3
DH_generate_key.3 DH_generate_parameters.3 DH_get0_pqg.3
DH_get_1024_160.3 DH_meth_new.3 DH_new.3 DH_new_by_nid.3
DH_set_method.3 DH_size.3 DSA_SIG_new.3 DSA_do_sign.3 DSA_dup_DH.3
DSA_generate_key.3 DSA_generate_parameters.3 DSA_get0_pqg.3
DSA_meth_new.3 DSA_new.3 DSA_set_method.3 DSA_sign.3 DSA_size.3
DTLS_get_data_mtu.3 DTLS_set_timer_cb.3 DTLSv1_listen.3
ECDSA_SIG_new.3 ECPKParameters_print.3 EC_GFp_simple_method.3
EC_GROUP_copy.3 EC_GROUP_new.3 EC_KEY_get_enc_flags.3 EC_KEY_new.3
EC_POINT_add.3 EC_POINT_new.3 ENGINE_add.3 ERR_GET_LIB.3
ERR_clear_error.3 ERR_error_string.3 ERR_get_error.3
ERR_load_crypto_strings.3 ERR_load_strings.3 ERR_print_errors.3
ERR_put_error.3 ERR_remove_state.3 ERR_set_mark.3 EVP_BytesToKey.3
EVP_CIPHER_CTX_get_cipher_data.3 EVP_CIPHER_meth_new.3
EVP_DigestInit.3 EVP_DigestSignInit.3 EVP_DigestVerifyInit.3
EVP_EncodeInit.3 EVP_EncryptInit.3 EVP_MD_meth_new.3 EVP_OpenInit.3
EVP_PKEY_ASN1_METHOD.3 EVP_PKEY_CTX_ctrl.3 EVP_PKEY_CTX_new.3
EVP_PKEY_CTX_set1_pbe_pass.3 EVP_PKEY_CTX_set_hkdf_md.3
EVP_PKEY_CTX_set_rsa_pss_keygen_md.3 EVP_PKEY_CTX_set_scrypt_N.3
EVP_PKEY_CTX_set_tls1_prf_md.3 EVP_PKEY_asn1_get_count.3
EVP_PKEY_decrypt.3 EVP_PKEY_derive.3 EVP_PKEY_encrypt.3
EVP_PKEY_get_default_digest_nid.3 EVP_PKEY_keygen.3
EVP_PKEY_meth_get_count.3 EVP_PKEY_meth_new.3 EVP_PKEY_new.3
EVP_PKEY_print_private.3 EVP_PKEY_set1_RSA.3 EVP_PKEY_sign.3
EVP_PKEY_verify.3 EVP_PKEY_verify_recover.3 EVP_SealInit.3
EVP_SignInit.3 EVP_VerifyInit.3 EVP_bf_cbc.3 EVP_blake2b512.3
EVP_cast5_cbc.3 EVP_chacha20.3 EVP_desx_cbc.3 EVP_idea_cbc.3
EVP_md2.3 EVP_md4.3 EVP_md5.3 EVP_mdc2.3 EVP_rc2_cbc.3 EVP_rc4.3
EVP_rc5_32_12_16_cbc.3 EVP_ripemd160.3 EVP_seed_cbc.3 EVP_sha1.3
EVP_sha224.3 EVP_sha3_224.3 EVP_sm3.3 EVP_sm4_cbc.3 EVP_whirlpool.3
HMAC.3 MD5.3 MDC2_Init.3 Makefile OBJ_nid2obj.3 OCSP_REQUEST_new.3
OCSP_cert_to_id.3 OCSP_request_add1_nonce.3 OCSP_resp_find_status.3
OCSP_response_status.3 OCSP_sendreq_new.3 OPENSSL_Applink.3
OPENSSL_LH_COMPFUNC.3 OPENSSL_LH_stats.3 OPENSSL_config.3
OPENSSL_fork_prepare.3 OPENSSL_ia32cap.3 OPENSSL_init_crypto.3
OPENSSL_init_ssl.3 OPENSSL_instrument_bus.3
OPENSSL_load_builtin_modules.3 OPENSSL_malloc.3
OPENSSL_secure_malloc.3 OSSL_STORE_INFO.3 OSSL_STORE_LOADER.3
OSSL_STORE_SEARCH.3 OSSL_STORE_expect.3 OSSL_STORE_open.3
OpenSSL_add_all_algorithms.3 PEM_bytes_read_bio.3 PEM_read.3
PEM_read_CMS.3 PEM_read_bio_PrivateKey.3 PEM_read_bio_ex.3
PEM_write_bio_CMS_stream.3 PEM_write_bio_PKCS7_stream.3
PKCS12_create.3 

CVS commit: src/crypto/external/bsd/openssl/lib

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 19:13:15 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile crypto.inc
src/crypto/external/bsd/openssl/lib/libssl: Makefile

Log Message:
misc cleanups


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libssl/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/crypto/external/bsd/openssl/lib

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 19:13:15 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile crypto.inc
src/crypto/external/bsd/openssl/lib/libssl: Makefile

Log Message:
misc cleanups


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libssl/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.24 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.25
--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.24	Sat May  6 13:21:51 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile	Sun May  7 15:13:15 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2023/05/06 17:21:51 christos Exp $
+#	$NetBSD: Makefile,v 1.25 2023/05/07 19:13:15 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -43,18 +43,14 @@ CPPFLAGS+= -I${OPENSSLSRC}/include -I${O
 CPPFLAGS+= -I${OPENSSLSRC}/crypto/asn1 -I${OPENSSLSRC}/crypto/evp
 CPPFLAGS+= -I${OPENSSLSRC}/crypto/modes
 CPPFLAGS+= -I${OPENSSLSRC}/../include
-CPPFLAGS+= -I${OPENSSLSRC}/providers/common/include
-CPPFLAGS+= -I${OPENSSLSRC}/providers/implementations/include
 
 
 CRYPTODIST=	${NETBSDSRCDIR}/crypto
 OPENSSLINC=	${OPENSSLSRC}/include/openssl
 
 .include "${NETBSDSRCDIR}/crypto/Makefile.openssl"
-.PATH: ${OPENSSLSRC} ${OPENSSLINC}
+.PATH: ${OPENSSLSRC} ${OPENSSLINC} 
 .PATH: ${OPENSSLSRC}/../include/openssl
-.PATH: ${OPENSSLSRC}/providers/implementations/digests
-.PATH: ${OPENSSLSRC}/providers/implementations/macs
 
 .include "srcs.inc"
 .include "${.CURDIR}/../libdefault/srcs.inc"
@@ -286,7 +282,6 @@ pkcs12.h \
 pkcs7.h \
 safestack.h \
 srp.h \
-ssl.h \
 ui.h \
 x509.h \
 x509_vfy.h \

Index: src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.11 src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.12
--- src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc:1.11	Sat May  6 13:07:22 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/crypto.inc	Sun May  7 15:13:15 2023
@@ -1,6 +1,6 @@
-#	$NetBSD: crypto.inc,v 1.11 2023/05/06 17:07:22 christos Exp $
+#	$NetBSD: crypto.inc,v 1.12 2023/05/07 19:13:15 christos Exp $
 
-.PATH:	${OPENSSLSRC}/crypto/crypto
+.PATH:	${OPENSSLSRC}/crypto
 
 CRYPTO_SRCS += \
 asn1_dsa.c \

Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.11 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.12
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.11	Sat May  6 13:07:24 2023
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile	Sun May  7 15:13:15 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2023/05/06 17:07:24 christos Exp $
+#	$NetBSD: Makefile,v 1.12 2023/05/07 19:13:15 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -57,7 +57,7 @@ ssl.h
 .for i in ${GENH}
 $i: $i.in
 	${_MKTARGET_CREATE}
-	${.CURDIR}/../../gen ${.ALLSRC} > ${.TARGET}
+	${.CURDIR}/../libcrypto/gen ${.ALLSRC} > ${.TARGET}
 .endfor
 
 .include 



CVS commit: src/crypto/external/bsd/openssl

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 18:41:35 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/bin: Makefile
src/crypto/external/bsd/openssl/include: progs.h
src/crypto/external/bsd/openssl/include/crypto: bn_conf.h dso_conf.h
Added Files:
src/crypto/external/bsd/openssl/include/openssl: configuration.h
fipskey.h opensslv.h
Removed Files:
src/crypto/external/bsd/openssl/bin: progs.h
src/crypto/external/bsd/openssl/include/openssl: opensslconf.h

Log Message:
merge the rest of the changes, this now builds on x86_64.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssl/bin/Makefile
cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/openssl/bin/progs.h
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/include/progs.h
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/include/crypto/bn_conf.h \
src/crypto/external/bsd/openssl/include/crypto/dso_conf.h
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/include/openssl/configuration.h \
src/crypto/external/bsd/openssl/include/openssl/fipskey.h \
src/crypto/external/bsd/openssl/include/openssl/opensslv.h
cvs rdiff -u -r1.9 -r0 \
src/crypto/external/bsd/openssl/include/openssl/opensslconf.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/crypto/external/bsd/openssl

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 18:41:35 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/bin: Makefile
src/crypto/external/bsd/openssl/include: progs.h
src/crypto/external/bsd/openssl/include/crypto: bn_conf.h dso_conf.h
Added Files:
src/crypto/external/bsd/openssl/include/openssl: configuration.h
fipskey.h opensslv.h
Removed Files:
src/crypto/external/bsd/openssl/bin: progs.h
src/crypto/external/bsd/openssl/include/openssl: opensslconf.h

Log Message:
merge the rest of the changes, this now builds on x86_64.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssl/bin/Makefile
cvs rdiff -u -r1.1 -r0 src/crypto/external/bsd/openssl/bin/progs.h
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/include/progs.h
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/include/crypto/bn_conf.h \
src/crypto/external/bsd/openssl/include/crypto/dso_conf.h
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/include/openssl/configuration.h \
src/crypto/external/bsd/openssl/include/openssl/fipskey.h \
src/crypto/external/bsd/openssl/include/openssl/opensslv.h
cvs rdiff -u -r1.9 -r0 \
src/crypto/external/bsd/openssl/include/openssl/opensslconf.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/bin/Makefile
diff -u src/crypto/external/bsd/openssl/bin/Makefile:1.11 src/crypto/external/bsd/openssl/bin/Makefile:1.12
--- src/crypto/external/bsd/openssl/bin/Makefile:1.11	Sun May  7 12:19:24 2023
+++ src/crypto/external/bsd/openssl/bin/Makefile	Sun May  7 14:41:34 2023
@@ -1,6 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2023/05/07 16:19:24 christos Exp $
-
-WARNS?=	2	# XXX -Wcast-qual
+#	$NetBSD: Makefile,v 1.12 2023/05/07 18:41:34 christos Exp $
 
 NOMAN=	# defined
 BINDIR=/usr/bin
@@ -9,22 +7,6 @@ BINDIR=/usr/bin
 
 USE_FORT?= yes	# cryptographic software
 
-# RCSid:
-#	$Id: Makefile,v 1.11 2023/05/07 16:19:24 christos Exp $
-#
-#	@(#) Copyright (c) 1995 Simon J. Gerraty
-#
-#	This file is provided in the hope that it will
-#	be of use.  There is absolutely NO WARRANTY.
-#	Permission to copy, redistribute or otherwise
-#	use this file is hereby granted provided that 
-#	the above copyright notice and this notice are
-#	left intact. 
-#  
-#	Please send copies of changes and bug-fixes to:
-#	s...@quick.com.au
-#
-
 PROG=	openssl
 
 SRCS+= \
@@ -83,7 +65,7 @@ verify.c \
 version.c \
 x509.c \
 
-CPPFLAGS+= -DMONOLITH -DUSE_SSL -I${OPENSSLSRC} -I${.CURDIR}
+CPPFLAGS+= -I${OPENSSLSRC} -I${.CURDIR}/../include
 CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/apps/include
 
 PROGDPLIBSSTATIC=yes

Index: src/crypto/external/bsd/openssl/include/progs.h
diff -u src/crypto/external/bsd/openssl/include/progs.h:1.2 src/crypto/external/bsd/openssl/include/progs.h:1.3
--- src/crypto/external/bsd/openssl/include/progs.h:1.2	Sun Sep 23 09:33:03 2018
+++ src/crypto/external/bsd/openssl/include/progs.h	Sun May  7 14:41:35 2023
@@ -2,31 +2,20 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * 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
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
  */
 
-typedef enum FUNC_TYPE {
-FT_none, FT_general, FT_md, FT_cipher, FT_pkey,
-FT_md_alg, FT_cipher_alg
-} FUNC_TYPE;
-
-typedef struct function_st {
-FUNC_TYPE type;
-const char *name;
-int (*func)(int argc, char *argv[]);
-const OPTIONS *help;
-} FUNCTION;
-
-DEFINE_LHASH_OF(FUNCTION);
+#include "function.h"
 
 extern int asn1parse_main(int argc, char *argv[]);
 extern int ca_main(int argc, char *argv[]);
 extern int ciphers_main(int argc, char *argv[]);
+extern int cmp_main(int argc, char *argv[]);
 extern int cms_main(int argc, char *argv[]);
 extern int crl_main(int argc, char *argv[]);
 extern int crl2pkcs7_main(int argc, char *argv[]);
@@ -39,11 +28,15 @@ extern int ecparam_main(int argc, char *
 extern int enc_main(int argc, char *argv[]);
 extern int engine_main(int argc, char *argv[]);
 extern int errstr_main(int argc, char *argv[]);
+extern int fipsinstall_main(int argc, char *argv[]);
 extern int gendsa_main(int argc, char *argv[]);
 extern int genpkey_main(int argc, char *argv[]);
 extern int genrsa_main(int argc, char *argv[]);
 extern int help_main(int argc, char *argv[]);
+extern int info_main(int argc, char *argv[]);
+extern int kdf_main(int argc, char *argv[]);
 extern int list_main(int argc, char *argv[]);
+extern int 

CVS commit: src/crypto/external/bsd/openssl/dist

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 18:40:31 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/dist: Configure e_os.h
src/crypto/external/bsd/openssl/dist/apps: ca.c cmp.c ocsp.c openssl.c
openssl.cnf req.c s_client.c s_server.c s_time.c speed.c
src/crypto/external/bsd/openssl/dist/apps/lib: apps.c opt.c
src/crypto/external/bsd/openssl/dist/crypto: LPdir_vms.c LPdir_win.c
arm_arch.h armcap.c cryptlib.c cversion.c ex_data.c mem.c mem_clr.c
ppccap.c ppccpuid.pl sparccpuid.S threads_pthread.c uid.c
x86_64cpuid.pl
src/crypto/external/bsd/openssl/dist/crypto/aes/asm:
aesni-sha1-x86_64.pl aesni-x86_64.pl
src/crypto/external/bsd/openssl/dist/crypto/asn1: a_d2i_fp.c a_strex.c
a_type.c asn_mime.c asn_pack.c tasn_dec.c tasn_enc.c
src/crypto/external/bsd/openssl/dist/crypto/bio: bio_lib.c bss_file.c
bss_log.c
src/crypto/external/bsd/openssl/dist/crypto/bn: bn_exp.c bn_lib.c
bn_mont.c bn_nist.c bn_print.c bn_rand.c
src/crypto/external/bsd/openssl/dist/crypto/bn/asm: mips.pl
x86_64-gcc.c x86_64-gf2m.pl
src/crypto/external/bsd/openssl/dist/crypto/buffer: buffer.c
src/crypto/external/bsd/openssl/dist/crypto/cms: cms_pwri.c
src/crypto/external/bsd/openssl/dist/crypto/comp: c_zlib.c
src/crypto/external/bsd/openssl/dist/crypto/conf: conf_def.c
src/crypto/external/bsd/openssl/dist/crypto/des: rand_key.c
src/crypto/external/bsd/openssl/dist/crypto/dh: dh_lib.c
src/crypto/external/bsd/openssl/dist/crypto/dsa: dsa_ameth.c dsa_lib.c
src/crypto/external/bsd/openssl/dist/crypto/dso: dso_dlfcn.c
src/crypto/external/bsd/openssl/dist/crypto/ec: ec2_smpl.c ec_ameth.c
ec_asn1.c ec_key.c ec_lib.c ecp_mont.c ecp_nist.c ecp_smpl.c
src/crypto/external/bsd/openssl/dist/crypto/engine: eng_all.c eng_lib.c
src/crypto/external/bsd/openssl/dist/crypto/err: openssl.ec
src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c evp_enc.c
src/crypto/external/bsd/openssl/dist/crypto/hmac: hmac.c
src/crypto/external/bsd/openssl/dist/crypto/idea: i_cbc.c i_cfb64.c
i_ecb.c i_ofb64.c i_skey.c
src/crypto/external/bsd/openssl/dist/crypto/lhash: lhash.c
src/crypto/external/bsd/openssl/dist/crypto/md4: md4_dgst.c
src/crypto/external/bsd/openssl/dist/crypto/md5: md5_dgst.c
src/crypto/external/bsd/openssl/dist/crypto/md5/asm: md5-x86_64.pl
src/crypto/external/bsd/openssl/dist/crypto/modes: gcm128.c
src/crypto/external/bsd/openssl/dist/crypto/objects: o_names.c
src/crypto/external/bsd/openssl/dist/crypto/ocsp: ocsp_vfy.c
src/crypto/external/bsd/openssl/dist/crypto/perlasm: x86gas.pl
src/crypto/external/bsd/openssl/dist/crypto/pkcs12: p12_decr.c
src/crypto/external/bsd/openssl/dist/crypto/pkcs7: pk7_doit.c pk7_lib.c
src/crypto/external/bsd/openssl/dist/crypto/rand: rand_egd.c randfile.c
src/crypto/external/bsd/openssl/dist/crypto/rc2: rc2_cbc.c rc2_ecb.c
rc2_local.h rc2cfb64.c rc2ofb64.c
src/crypto/external/bsd/openssl/dist/crypto/rc4/asm: rc4-x86_64.pl
src/crypto/external/bsd/openssl/dist/crypto/rc5: rc5_ecb.c rc5_enc.c
rc5cfb64.c rc5ofb64.c
src/crypto/external/bsd/openssl/dist/crypto/ripemd: rmd_dgst.c
src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_err.c rsa_gen.c
rsa_lib.c rsa_oaep.c rsa_pk1.c rsa_sign.c
src/crypto/external/bsd/openssl/dist/crypto/sha: keccak1600.c sha256.c
src/crypto/external/bsd/openssl/dist/crypto/sha/asm:
keccak1600-ppc64.pl keccak1600p8-ppc.pl sha1-x86_64.pl
src/crypto/external/bsd/openssl/dist/crypto/stack: stack.c
src/crypto/external/bsd/openssl/dist/crypto/ui: ui_lib.c ui_openssl.c
src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c
src/crypto/external/bsd/openssl/dist/engines: e_padlock.c
src/crypto/external/bsd/openssl/dist/include/internal: refcount.h
tsan_assist.h
src/crypto/external/bsd/openssl/dist/include/openssl: bio.h.in bn.h
idea.h rc2.h sha.h
src/crypto/external/bsd/openssl/dist/ssl: d1_lib.c d1_srtp.c s3_cbc.c
s3_enc.c s3_lib.c ssl_ciph.c ssl_err.c ssl_lib.c ssl_sess.c
t1_enc.c t1_lib.c tls_srp.c
src/crypto/external/bsd/openssl/dist/test: bftest.c bntest.c casttest.c
constant_time_test.c destest.c dhtest.c dsatest.c ecdsatest.c
ectest.c enginetest.c evp_extra_test.c evp_test.c exptest.c
hmactest.c ideatest.c mdc2test.c rc2test.c rc4test.c rc5test.c
rsa_test.c srptest.c threadstest.c
src/crypto/external/bsd/openssl/dist/test/testutil: basic_output.c
driver.c fake_random.c format_output.c 

CVS commit: src/crypto/external/bsd/openssl/dist

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 18:40:31 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/dist: Configure e_os.h
src/crypto/external/bsd/openssl/dist/apps: ca.c cmp.c ocsp.c openssl.c
openssl.cnf req.c s_client.c s_server.c s_time.c speed.c
src/crypto/external/bsd/openssl/dist/apps/lib: apps.c opt.c
src/crypto/external/bsd/openssl/dist/crypto: LPdir_vms.c LPdir_win.c
arm_arch.h armcap.c cryptlib.c cversion.c ex_data.c mem.c mem_clr.c
ppccap.c ppccpuid.pl sparccpuid.S threads_pthread.c uid.c
x86_64cpuid.pl
src/crypto/external/bsd/openssl/dist/crypto/aes/asm:
aesni-sha1-x86_64.pl aesni-x86_64.pl
src/crypto/external/bsd/openssl/dist/crypto/asn1: a_d2i_fp.c a_strex.c
a_type.c asn_mime.c asn_pack.c tasn_dec.c tasn_enc.c
src/crypto/external/bsd/openssl/dist/crypto/bio: bio_lib.c bss_file.c
bss_log.c
src/crypto/external/bsd/openssl/dist/crypto/bn: bn_exp.c bn_lib.c
bn_mont.c bn_nist.c bn_print.c bn_rand.c
src/crypto/external/bsd/openssl/dist/crypto/bn/asm: mips.pl
x86_64-gcc.c x86_64-gf2m.pl
src/crypto/external/bsd/openssl/dist/crypto/buffer: buffer.c
src/crypto/external/bsd/openssl/dist/crypto/cms: cms_pwri.c
src/crypto/external/bsd/openssl/dist/crypto/comp: c_zlib.c
src/crypto/external/bsd/openssl/dist/crypto/conf: conf_def.c
src/crypto/external/bsd/openssl/dist/crypto/des: rand_key.c
src/crypto/external/bsd/openssl/dist/crypto/dh: dh_lib.c
src/crypto/external/bsd/openssl/dist/crypto/dsa: dsa_ameth.c dsa_lib.c
src/crypto/external/bsd/openssl/dist/crypto/dso: dso_dlfcn.c
src/crypto/external/bsd/openssl/dist/crypto/ec: ec2_smpl.c ec_ameth.c
ec_asn1.c ec_key.c ec_lib.c ecp_mont.c ecp_nist.c ecp_smpl.c
src/crypto/external/bsd/openssl/dist/crypto/engine: eng_all.c eng_lib.c
src/crypto/external/bsd/openssl/dist/crypto/err: openssl.ec
src/crypto/external/bsd/openssl/dist/crypto/evp: e_aes.c evp_enc.c
src/crypto/external/bsd/openssl/dist/crypto/hmac: hmac.c
src/crypto/external/bsd/openssl/dist/crypto/idea: i_cbc.c i_cfb64.c
i_ecb.c i_ofb64.c i_skey.c
src/crypto/external/bsd/openssl/dist/crypto/lhash: lhash.c
src/crypto/external/bsd/openssl/dist/crypto/md4: md4_dgst.c
src/crypto/external/bsd/openssl/dist/crypto/md5: md5_dgst.c
src/crypto/external/bsd/openssl/dist/crypto/md5/asm: md5-x86_64.pl
src/crypto/external/bsd/openssl/dist/crypto/modes: gcm128.c
src/crypto/external/bsd/openssl/dist/crypto/objects: o_names.c
src/crypto/external/bsd/openssl/dist/crypto/ocsp: ocsp_vfy.c
src/crypto/external/bsd/openssl/dist/crypto/perlasm: x86gas.pl
src/crypto/external/bsd/openssl/dist/crypto/pkcs12: p12_decr.c
src/crypto/external/bsd/openssl/dist/crypto/pkcs7: pk7_doit.c pk7_lib.c
src/crypto/external/bsd/openssl/dist/crypto/rand: rand_egd.c randfile.c
src/crypto/external/bsd/openssl/dist/crypto/rc2: rc2_cbc.c rc2_ecb.c
rc2_local.h rc2cfb64.c rc2ofb64.c
src/crypto/external/bsd/openssl/dist/crypto/rc4/asm: rc4-x86_64.pl
src/crypto/external/bsd/openssl/dist/crypto/rc5: rc5_ecb.c rc5_enc.c
rc5cfb64.c rc5ofb64.c
src/crypto/external/bsd/openssl/dist/crypto/ripemd: rmd_dgst.c
src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_err.c rsa_gen.c
rsa_lib.c rsa_oaep.c rsa_pk1.c rsa_sign.c
src/crypto/external/bsd/openssl/dist/crypto/sha: keccak1600.c sha256.c
src/crypto/external/bsd/openssl/dist/crypto/sha/asm:
keccak1600-ppc64.pl keccak1600p8-ppc.pl sha1-x86_64.pl
src/crypto/external/bsd/openssl/dist/crypto/stack: stack.c
src/crypto/external/bsd/openssl/dist/crypto/ui: ui_lib.c ui_openssl.c
src/crypto/external/bsd/openssl/dist/crypto/x509: x509_vfy.c
src/crypto/external/bsd/openssl/dist/engines: e_padlock.c
src/crypto/external/bsd/openssl/dist/include/internal: refcount.h
tsan_assist.h
src/crypto/external/bsd/openssl/dist/include/openssl: bio.h.in bn.h
idea.h rc2.h sha.h
src/crypto/external/bsd/openssl/dist/ssl: d1_lib.c d1_srtp.c s3_cbc.c
s3_enc.c s3_lib.c ssl_ciph.c ssl_err.c ssl_lib.c ssl_sess.c
t1_enc.c t1_lib.c tls_srp.c
src/crypto/external/bsd/openssl/dist/test: bftest.c bntest.c casttest.c
constant_time_test.c destest.c dhtest.c dsatest.c ecdsatest.c
ectest.c enginetest.c evp_extra_test.c evp_test.c exptest.c
hmactest.c ideatest.c mdc2test.c rc2test.c rc4test.c rc5test.c
rsa_test.c srptest.c threadstest.c
src/crypto/external/bsd/openssl/dist/test/testutil: basic_output.c
driver.c fake_random.c format_output.c 

Re: CVS commit: src/distrib/sets/lists/dtb

2023-05-07 Thread Manuel Bouyer
On Sat, May 06, 2023 at 08:43:20AM +, Nick Hudson wrote:
> Module Name:  src
> Committed By: skrll
> Date: Sat May  6 08:43:20 UTC 2023
> 
> Modified Files:
>   src/distrib/sets/lists/dtb: ad.earmv7hfeb
> 
> Log Message:
> Add imx6sx dtb files for BE too

Hum, I'm not sure that this SoC can run in BE mode.
I can't check righ now, I don't have access to my copy of the i.mx
document.

-- 
Manuel Bouyer 
 NetBSD: 26 ans d'experience feront toujours la difference
--


CVS commit: othersrc/usr.bin/tnftp

2023-05-07 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Sun May  7 18:32:11 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog NEWS configure configure.ac

Log Message:
tnftp 20230507 release

Changes since tnftp 20230409
* Add timeout for SSL connection setup, defaulting to 60 seconds.
* Update to NetBSD-ftp 20230505.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 othersrc/usr.bin/tnftp/ChangeLog
cvs rdiff -u -r1.17 -r1.18 othersrc/usr.bin/tnftp/NEWS
cvs rdiff -u -r1.62 -r1.63 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.47 -r1.48 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/ChangeLog
diff -u othersrc/usr.bin/tnftp/ChangeLog:1.80 othersrc/usr.bin/tnftp/ChangeLog:1.81
--- othersrc/usr.bin/tnftp/ChangeLog:1.80	Sat May  6 09:45:20 2023
+++ othersrc/usr.bin/tnftp/ChangeLog	Sun May  7 18:32:11 2023
@@ -1,6 +1,12 @@
-$NetBSD: ChangeLog,v 1.80 2023/05/06 09:45:20 lukem Exp $
+$NetBSD: ChangeLog,v 1.81 2023/05/07 18:32:11 lukem Exp $
 
-Sat May  6 09:43:04 UTC 2023
+Sun May  7 18:30:03 UTC 2023	lukem
+
+	* Release as "tnftp 20230507".
+
+	* Consistency fixes in ChangeLog and NEWS.
+
+Sat May  6 09:43:04 UTC 2023	lukem
 
 	* Merge NetBSD ftp from 20230226 to 20230505:
 		* Add timeout for SSL connection setup, defaulting to 60
@@ -9,7 +15,7 @@ Sat May  6 09:43:04 UTC 2023
 		* Check EAGAIN as well as EINTR.
 		* Simplify includes.
 
-Sun Apr  9 06:45:06 UTC 2023
+Sun Apr  9 06:45:06 UTC 2023	lukem
 
 	* Release as "tnftp 20230409".
 
@@ -29,7 +35,7 @@ Sun Apr  9 06:45:06 UTC 2023
 		* Equivalent to "NetBSD-ftp 20230225" with documentation
 		  and portability fixes.
 
-Fri Aug 27 02:06:34 UTC 2021
+Fri Aug 27 02:06:34 UTC 2021	lukem
 
 	* Release as "tnftp 20210827".
 
@@ -47,7 +53,7 @@ Fri Aug 27 02:06:34 UTC 2021
 		  data connection elsewhere.
 		* Remove unnecessary variable assignments.
 
-Wed Aug 25 01:48:47 UTC 2021
+Wed Aug 25 01:48:47 UTC 2021	lukem
 
 	* configure:
 		* Update to automake 1.16.1.

Index: othersrc/usr.bin/tnftp/NEWS
diff -u othersrc/usr.bin/tnftp/NEWS:1.17 othersrc/usr.bin/tnftp/NEWS:1.18
--- othersrc/usr.bin/tnftp/NEWS:1.17	Sun Apr  9 06:49:34 2023
+++ othersrc/usr.bin/tnftp/NEWS	Sun May  7 18:32:11 2023
@@ -1,8 +1,14 @@
-$NetBSD: NEWS,v 1.17 2023/04/09 06:49:34 lukem Exp $
+$NetBSD: NEWS,v 1.18 2023/05/07 18:32:11 lukem Exp $
 
-This is tnftp version 20230409.
+This is tnftp version 20230507.
 
-Changes in tnftp 20210827 to 20230409:
+Changes in tnftp from 20230409 to 20230507:
+
+	Add timeout for SSL connection setup, defaulting to 60 seconds.
+
+	Update to NetBSD-ftp 20230505.
+
+Changes in tnftp from 20210827 to 20230409:
 
 	Validate SSL certificates by default, disabled with
 	FTPSSLNOVERIFY=1 in the environment, or option sslnoverify.
@@ -16,7 +22,7 @@ Changes in tnftp 20210827 to 20230409:
 
 	Update to NetBSD-ftp 20230225.
 
-Changes in tnftp 20200705 to 20210827:
+Changes in tnftp from 20200705 to 20210827:
 
 	Validate address in server's PASV and LPSV responses. Previously a
 	hostile server could cause ftp to open a data connection elsewhere.
@@ -36,7 +42,7 @@ Changes in tnftp 20200705 to 20210827:
 
 	Display usage to stdout with -?.
 
-Changes in tnftp 20151004 to 20200705:
+Changes in tnftp from 20151004 to 20200705:
 
 	Avoid crashes by exiting if lostpeer due to a signal
 	(e.g., remote server disconnection).
@@ -67,7 +73,7 @@ Changes in tnftp 20151004 to 20200705:
 
 	Portability improvements.
 
-Changes in tnftp 20141104 to 20151004:
+Changes in tnftp from 20141104 to 20151004:
 
 	Implement '-x xferbufsize' to set xferbuf size.
 

Index: othersrc/usr.bin/tnftp/configure
diff -u othersrc/usr.bin/tnftp/configure:1.62 othersrc/usr.bin/tnftp/configure:1.63
--- othersrc/usr.bin/tnftp/configure:1.62	Sun Apr  9 06:57:25 2023
+++ othersrc/usr.bin/tnftp/configure	Sun May  7 18:32:11 2023
@@ -1,7 +1,6 @@
 #! /bin/sh
-# From configure.ac Revision: 1.46 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for tnftp 20230409.
+# Generated by GNU Autoconf 2.69 for tnftp 20230507.
 #
 # Report bugs to .
 #
@@ -596,8 +595,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='tnftp'
 PACKAGE_TARNAME='tnftp'
-PACKAGE_VERSION='20230409'
-PACKAGE_STRING='tnftp 20230409'
+PACKAGE_VERSION='20230507'
+PACKAGE_STRING='tnftp 20230507'
 PACKAGE_BUGREPORT='lu...@netbsd.org'
 PACKAGE_URL=''
 
@@ -1341,7 +1340,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tnftp 20230409 to adapt to many kinds of systems.
+\`configure' configures tnftp 20230507 to adapt to many kinds of systems.
 
 Usage: $0 [

CVS commit: othersrc/usr.bin/tnftp

2023-05-07 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Sun May  7 18:32:11 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: ChangeLog NEWS configure configure.ac

Log Message:
tnftp 20230507 release

Changes since tnftp 20230409
* Add timeout for SSL connection setup, defaulting to 60 seconds.
* Update to NetBSD-ftp 20230505.


To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 othersrc/usr.bin/tnftp/ChangeLog
cvs rdiff -u -r1.17 -r1.18 othersrc/usr.bin/tnftp/NEWS
cvs rdiff -u -r1.62 -r1.63 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.47 -r1.48 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: othersrc/usr.bin/tnftp

2023-05-07 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Sun May  7 18:21:15 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure.ac: deprecate AC_REVISION

Allows regen as part of the release commit / tag


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: othersrc/usr.bin/tnftp/configure.ac
diff -u othersrc/usr.bin/tnftp/configure.ac:1.46 othersrc/usr.bin/tnftp/configure.ac:1.47
--- othersrc/usr.bin/tnftp/configure.ac:1.46	Sun Apr  9 06:49:34 2023
+++ othersrc/usr.bin/tnftp/configure.ac	Sun May  7 18:21:15 2023
@@ -1,4 +1,4 @@
-#   $NetBSD: configure.ac,v 1.46 2023/04/09 06:49:34 lukem Exp $
+#   $NetBSD: configure.ac,v 1.47 2023/05/07 18:21:15 lukem Exp $
 #
 # Process this file with autoconf to produce a configure script.
 
@@ -9,7 +9,6 @@ AC_COPYRIGHT([
 Copyright (c) 1999-2023 The NetBSD Foundation, Inc.
 All rights reserved.
 ])
-AC_REVISION([$Revision: 1.46 $])
 
 AS_SHELL_SANITIZE()
 



CVS commit: othersrc/usr.bin/tnftp

2023-05-07 Thread Luke Mewburn
Module Name:othersrc
Committed By:   lukem
Date:   Sun May  7 18:21:15 UTC 2023

Modified Files:
othersrc/usr.bin/tnftp: configure.ac

Log Message:
configure.ac: deprecate AC_REVISION

Allows regen as part of the release commit / tag


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 othersrc/usr.bin/tnftp/configure.ac

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/doc

2023-05-07 Thread Luke Mewburn
Module Name:src
Committed By:   lukem
Date:   Sun May  7 18:15:38 UTC 2023

Modified Files:
src/doc: CHANGES

Log Message:
CHANGES: ftp(1) ssl connection timeout


To generate a diff of this commit:
cvs rdiff -u -r1.2961 -r1.2962 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.2961 src/doc/CHANGES:1.2962
--- src/doc/CHANGES:1.2961	Fri Apr 21 17:00:05 2023
+++ src/doc/CHANGES	Sun May  7 18:15:38 2023
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2961 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.2962 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -85,4 +85,5 @@ Changes from NetBSD 10.0 to NetBSD 11.0:
 		Bumped shlib major because of incompatible API/ABI changes.
 		[nikita 20230416]
 	dhcpcd: Import version 10.0.1. [roy 20230421]
-
+	ftp(1): Add timeout for SSL connection setup, defaulting to 60 seconds.
+		[lukem 20230505]



CVS commit: src/doc

2023-05-07 Thread Luke Mewburn
Module Name:src
Committed By:   lukem
Date:   Sun May  7 18:15:38 UTC 2023

Modified Files:
src/doc: CHANGES

Log Message:
CHANGES: ftp(1) ssl connection timeout


To generate a diff of this commit:
cvs rdiff -u -r1.2961 -r1.2962 src/doc/CHANGES

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/usr.bin/make

2023-05-07 Thread Simon J. Gerraty
Module Name:src
Committed By:   sjg
Date:   Sun May  7 16:43:50 UTC 2023

Modified Files:
src/usr.bin/make: make.1

Log Message:
make.1: lose the trailing blank lines


To generate a diff of this commit:
cvs rdiff -u -r1.362 -r1.363 src/usr.bin/make/make.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/usr.bin/make

2023-05-07 Thread Simon J. Gerraty
Module Name:src
Committed By:   sjg
Date:   Sun May  7 16:43:50 UTC 2023

Modified Files:
src/usr.bin/make: make.1

Log Message:
make.1: lose the trailing blank lines


To generate a diff of this commit:
cvs rdiff -u -r1.362 -r1.363 src/usr.bin/make/make.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.362 src/usr.bin/make/make.1:1.363
--- src/usr.bin/make/make.1:1.362	Sun May  7 16:32:47 2023
+++ src/usr.bin/make/make.1	Sun May  7 16:43:50 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.362 2023/05/07 16:32:47 sjg Exp $
+.\"	$NetBSD: make.1,v 1.363 2023/05/07 16:43:50 sjg Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -2727,5 +2727,3 @@ using that token pool to abort the build
 Sometimes the attempt to suppress a cascade of unnecessary errors,
 can result in a seemingly unexplained
 .Ql *** Error code 6
-
-



CVS commit: src/usr.bin/make

2023-05-07 Thread Simon J. Gerraty
Module Name:src
Committed By:   sjg
Date:   Sun May  7 16:32:48 UTC 2023

Modified Files:
src/usr.bin/make: make.1

Log Message:
make: fix description of .PREFIX

For at least 20 years, the setting of .PREFIX in make
has not matched the documentation.
Since the documented behavior does not match reality or
POSIX make, fix the documentation.

In FindDepsRegularPath str_basename is applied to .PREFIX
this is wrong, but I was unable to verify fixing it
was benign in NetBSD build - my NetBSD box (7.2)
was unable to build known-good src with or without any patches.

For now just document the behavior more accurately.


To generate a diff of this commit:
cvs rdiff -u -r1.361 -r1.362 src/usr.bin/make/make.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/make/make.1
diff -u src/usr.bin/make/make.1:1.361 src/usr.bin/make/make.1:1.362
--- src/usr.bin/make/make.1:1.361	Thu Mar 23 03:29:28 2023
+++ src/usr.bin/make/make.1	Sun May  7 16:32:47 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: make.1,v 1.361 2023/03/23 03:29:28 sjg Exp $
+.\"	$NetBSD: make.1,v 1.362 2023/05/07 16:32:47 sjg Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd March 22, 2023
+.Dd May 6, 2023
 .Dt MAKE 1
 .Os
 .Sh NAME
@@ -796,12 +796,10 @@ The list of sources for this target that
 known as
 .Sq Va \&? .
 .It Va .PREFIX
-The file prefix of the target, containing only the file portion, no suffix
-or preceding directory components; also known as
+The name of the target with suffix (if declared in
+.Ic .SUFFIXES )
+removed; also known as
 .Sq Va * .
-The suffix must be one of the known suffixes declared with
-.Ic .SUFFIXES ,
-or it is not recognized.
 .It Va .TARGET
 The name of the target; also known as
 .Sq Va @ .



CVS commit: src/usr.bin/make

2023-05-07 Thread Simon J. Gerraty
Module Name:src
Committed By:   sjg
Date:   Sun May  7 16:32:48 UTC 2023

Modified Files:
src/usr.bin/make: make.1

Log Message:
make: fix description of .PREFIX

For at least 20 years, the setting of .PREFIX in make
has not matched the documentation.
Since the documented behavior does not match reality or
POSIX make, fix the documentation.

In FindDepsRegularPath str_basename is applied to .PREFIX
this is wrong, but I was unable to verify fixing it
was benign in NetBSD build - my NetBSD box (7.2)
was unable to build known-good src with or without any patches.

For now just document the behavior more accurately.


To generate a diff of this commit:
cvs rdiff -u -r1.361 -r1.362 src/usr.bin/make/make.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/crypto

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 16:24:28 UTC 2023

Modified Files:
src/crypto: Makefile.openssl

Log Message:
Adjust for 3.x


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/crypto/Makefile.openssl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/Makefile.openssl
diff -u src/crypto/Makefile.openssl:1.12 src/crypto/Makefile.openssl:1.13
--- src/crypto/Makefile.openssl:1.12	Sat Mar 21 20:54:03 2020
+++ src/crypto/Makefile.openssl	Sun May  7 12:24:28 2023
@@ -1,12 +1,25 @@
-#	$NetBSD: Makefile.openssl,v 1.12 2020/03/22 00:54:03 christos Exp $
+#	$NetBSD: Makefile.openssl,v 1.13 2023/05/07 16:24:28 christos Exp $
 
 .ifndef _MAKEFILE_OPENSSL_INCLUDED
 _MAKEFILE_OPENSSL_INCLUDED=1
 
 .include 
 
+.if ${HAVE_OPENSSL} <= 11
+OSSL_ENGINESDIR=/usr/lib/openssl
+.else
+.	if defined(MLIBDIR)
+OSSL_LIBDIR=/usr/lib/${MLIBDIR}/openssl
+.	else
+OSSL_LIBDIR=/usr/lib/openssl
+.	endif
+OSSL_ENGINESDIR=${OSSL_LIBDIR}/engines
+OSSL_MODULESDIR=${OSSL_LIBDIR}/modules
+.endif
+
 OPENSSLSRC=	${CRYPTODIST}/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/dist
 CPPFLAGS+=	-DOPENSSLDIR=\"/etc/openssl\"
-CPPFLAGS+=	-DENGINESDIR=\"/usr/lib/openssl\"
+CPPFLAGS+=	-DENGINESDIR=\"${OSSL_ENGINESDIR}\"
+CPPFLAGS+=	-DMODULESDIR=\"${OSSL_MODULESDIR}\"
 
 .endif



CVS commit: src/crypto

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 16:24:28 UTC 2023

Modified Files:
src/crypto: Makefile.openssl

Log Message:
Adjust for 3.x


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/crypto/Makefile.openssl

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/crypto/external/bsd/openssl/lib

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 16:22:10 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto: libc-sha1.c
Added Files:
src/crypto/external/bsd/openssl/lib/libapps: Makefile PROTO.in
apps_lib.inc mkinc srcs.inc
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile PROTO.in
crypto.inc crypto_des.inc crypto_md5.inc legacy.map mkinc
providers.inc providers_common.inc
providers_implementations_ciphers.inc
providers_implementations_digests.inc
providers_implementations_kdfs.inc srcs.inc

Log Message:
more checkpointing


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/lib/libapps/Makefile \
src/crypto/external/bsd/openssl/lib/libapps/PROTO.in \
src/crypto/external/bsd/openssl/lib/libapps/apps_lib.inc \
src/crypto/external/bsd/openssl/lib/libapps/mkinc \
src/crypto/external/bsd/openssl/lib/libapps/srcs.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha1.c
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/lib/liblegacy/Makefile \
src/crypto/external/bsd/openssl/lib/liblegacy/PROTO.in \
src/crypto/external/bsd/openssl/lib/liblegacy/crypto.inc \
src/crypto/external/bsd/openssl/lib/liblegacy/crypto_des.inc \
src/crypto/external/bsd/openssl/lib/liblegacy/crypto_md5.inc \
src/crypto/external/bsd/openssl/lib/liblegacy/legacy.map \
src/crypto/external/bsd/openssl/lib/liblegacy/mkinc \
src/crypto/external/bsd/openssl/lib/liblegacy/providers.inc \
src/crypto/external/bsd/openssl/lib/liblegacy/providers_common.inc \

src/crypto/external/bsd/openssl/lib/liblegacy/providers_implementations_ciphers.inc
 \

src/crypto/external/bsd/openssl/lib/liblegacy/providers_implementations_digests.inc
 \

src/crypto/external/bsd/openssl/lib/liblegacy/providers_implementations_kdfs.inc
 \
src/crypto/external/bsd/openssl/lib/liblegacy/srcs.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/lib/Makefile
diff -u src/crypto/external/bsd/openssl/lib/Makefile:1.5 src/crypto/external/bsd/openssl/lib/Makefile:1.6
--- src/crypto/external/bsd/openssl/lib/Makefile:1.5	Sun Sep 23 11:08:41 2018
+++ src/crypto/external/bsd/openssl/lib/Makefile	Sun May  7 12:22:10 2023
@@ -1,9 +1,9 @@
-#	$NetBSD: Makefile,v 1.5 2018/09/23 15:08:41 christos Exp $
+#	$NetBSD: Makefile,v 1.6 2023/05/07 16:22:10 christos Exp $
 
 .include "bsd.own.mk"
 
 # OpenSSL libraries.
-SUBDIR= libcrypto libcryptotest libdes
+SUBDIR= libapps liblegacy libcrypto libcryptotest libdes
 
 SUBDIR+= .WAIT	libssl		# depends on libcrypto
 

Index: src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha1.c
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha1.c:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha1.c:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha1.c:1.1	Sat May  6 13:07:23 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha1.c	Sun May  7 12:22:10 2023
@@ -20,6 +20,21 @@
 #include 
 #include "crypto/sha.h"
 
+unsigned char *ossl_sha1(const unsigned char *d, size_t n, unsigned char *md)
+{
+SHA_CTX c;
+static unsigned char m[SHA_DIGEST_LENGTH];
+
+if (md == NULL)
+md = m;
+if (!SHA1_Init())
+return NULL;
+SHA1_Update(, d, n);
+SHA1_Final(md, );
+OPENSSL_cleanse(, sizeof(c));
+return md;
+}
+
 unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md)
 {
 static unsigned char m[SHA_DIGEST_LENGTH];

Added files:

Index: src/crypto/external/bsd/openssl/lib/libapps/Makefile
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.1
--- /dev/null	Sun May  7 12:22:10 2023
+++ src/crypto/external/bsd/openssl/lib/libapps/Makefile	Sun May  7 12:22:10 2023
@@ -0,0 +1,66 @@
+#	$NetBSD: Makefile,v 1.1 2023/05/07 16:22:10 christos Exp $
+
+# RCSid:
+#	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
+#
+#	@(#) Copyright (c) 1994 Simon J. Gerraty
+#
+#	This file is provided in the hope that it will
+#	be of use.  There is absolutely NO WARRANTY.
+#	Permission to copy, redistribute or otherwise
+#	use this file is hereby granted provided that 
+#	the above copyright notice and this notice are
+#	left intact. 
+#  
+#	Please send copies of changes and bug-fixes to:
+#	s...@quick.com.au
+#
+LIBISPRIVATE=	yes
+LIB=	apps
+USE_FORT?= yes	# cryptographic software
+USE_SHLIBDIR=	no
+USE_FIPS=	no
+#DBG=-g
+
+.include 
+.include 
+
+# XXX: There's a bit of work to do before we can enable warnings.
+WARNS=0
+CWARNFLAGS.clang+=	-Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion
+# XXX: This warning 

CVS commit: src/crypto/external/bsd/openssl/lib

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 16:22:10 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto: libc-sha1.c
Added Files:
src/crypto/external/bsd/openssl/lib/libapps: Makefile PROTO.in
apps_lib.inc mkinc srcs.inc
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile PROTO.in
crypto.inc crypto_des.inc crypto_md5.inc legacy.map mkinc
providers.inc providers_common.inc
providers_implementations_ciphers.inc
providers_implementations_digests.inc
providers_implementations_kdfs.inc srcs.inc

Log Message:
more checkpointing


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/lib/libapps/Makefile \
src/crypto/external/bsd/openssl/lib/libapps/PROTO.in \
src/crypto/external/bsd/openssl/lib/libapps/apps_lib.inc \
src/crypto/external/bsd/openssl/lib/libapps/mkinc \
src/crypto/external/bsd/openssl/lib/libapps/srcs.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha1.c
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/lib/liblegacy/Makefile \
src/crypto/external/bsd/openssl/lib/liblegacy/PROTO.in \
src/crypto/external/bsd/openssl/lib/liblegacy/crypto.inc \
src/crypto/external/bsd/openssl/lib/liblegacy/crypto_des.inc \
src/crypto/external/bsd/openssl/lib/liblegacy/crypto_md5.inc \
src/crypto/external/bsd/openssl/lib/liblegacy/legacy.map \
src/crypto/external/bsd/openssl/lib/liblegacy/mkinc \
src/crypto/external/bsd/openssl/lib/liblegacy/providers.inc \
src/crypto/external/bsd/openssl/lib/liblegacy/providers_common.inc \

src/crypto/external/bsd/openssl/lib/liblegacy/providers_implementations_ciphers.inc
 \

src/crypto/external/bsd/openssl/lib/liblegacy/providers_implementations_digests.inc
 \

src/crypto/external/bsd/openssl/lib/liblegacy/providers_implementations_kdfs.inc
 \
src/crypto/external/bsd/openssl/lib/liblegacy/srcs.inc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/crypto/external/bsd/openssl/lib/engines

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 16:21:20 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/engines: Makefile engines.mk
Added Files:
src/crypto/external/bsd/openssl/lib/engines/capi: capi.map
src/crypto/external/bsd/openssl/lib/engines/dasync: dasync.map
src/crypto/external/bsd/openssl/lib/engines/devcrypto: Makefile
devcrypto.map
src/crypto/external/bsd/openssl/lib/engines/loader_attic: Makefile
loader_attic.map
src/crypto/external/bsd/openssl/lib/engines/ossltest: ossltest.map
src/crypto/external/bsd/openssl/lib/engines/padlock: padlock.map

Log Message:
more engines and maps for them


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/engines/Makefile \
src/crypto/external/bsd/openssl/lib/engines/engines.mk
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/capi/capi.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile \
src/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile \
src/crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/crypto/external/bsd/openssl/lib/engines

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 16:21:20 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/engines: Makefile engines.mk
Added Files:
src/crypto/external/bsd/openssl/lib/engines/capi: capi.map
src/crypto/external/bsd/openssl/lib/engines/dasync: dasync.map
src/crypto/external/bsd/openssl/lib/engines/devcrypto: Makefile
devcrypto.map
src/crypto/external/bsd/openssl/lib/engines/loader_attic: Makefile
loader_attic.map
src/crypto/external/bsd/openssl/lib/engines/ossltest: ossltest.map
src/crypto/external/bsd/openssl/lib/engines/padlock: padlock.map

Log Message:
more engines and maps for them


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/engines/Makefile \
src/crypto/external/bsd/openssl/lib/engines/engines.mk
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/capi/capi.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile \
src/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/loader_attic/Makefile \
src/crypto/external/bsd/openssl/lib/engines/loader_attic/loader_attic.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/ossltest/ossltest.map
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/engines/padlock/padlock.map

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/lib/engines/Makefile
diff -u src/crypto/external/bsd/openssl/lib/engines/Makefile:1.1 src/crypto/external/bsd/openssl/lib/engines/Makefile:1.2
--- src/crypto/external/bsd/openssl/lib/engines/Makefile:1.1	Sat Dec  8 18:24:01 2018
+++ src/crypto/external/bsd/openssl/lib/engines/Makefile	Sun May  7 12:21:19 2023
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.1 2018/12/08 23:24:01 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2023/05/07 16:21:19 christos Exp $
 
 .include "bsd.own.mk"
 
 # OpenSSL engines.
-SUBDIR= capi dasync ossltest padlock
+SUBDIR= capi dasync devcrypto loader_attic ossltest padlock
 
 .include 
Index: src/crypto/external/bsd/openssl/lib/engines/engines.mk
diff -u src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.1 src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.2
--- src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.1	Sat Dec  8 18:24:01 2018
+++ src/crypto/external/bsd/openssl/lib/engines/engines.mk	Sun May  7 12:21:19 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: engines.mk,v 1.1 2018/12/08 23:24:01 christos Exp $
+#	$NetBSD: engines.mk,v 1.2 2023/05/07 16:21:19 christos Exp $
 
 NOLINT=		# don't build a lint library
 NOPROFILE=	# don't build a profile library
@@ -15,11 +15,7 @@ CRYPTODIST= ${NETBSDSRCDIR}/crypto
 
 CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/../include
  
-.if defined(MLIBDIR)
-LIBDIR=/usr/lib/${MLIBDIR}/openssl
-.else
-LIBDIR=/usr/lib/openssl
-.endif
+LIBDIR=${OSSL_ENGINESDIR}
 
 .if ${MKPIC} != "no"
 .PRECIOUS: ${DESTDIR}${LIBDIR}/${LIB}.so
@@ -28,6 +24,8 @@ libinstall:: ${DESTDIR}${LIBDIR}/${LIB}.
 libinstall::
 .endif
 
+LDFLAGS+=-Wl,--version-script=${.CURDIR}/${LIB}.map
+
 .include 
 
 ${DESTDIR}${LIBDIR}/${LIB}.so: lib${LIB}.so.${SHLIB_FULLVERSION}

Added files:

Index: src/crypto/external/bsd/openssl/lib/engines/capi/capi.map
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/capi/capi.map:1.1
--- /dev/null	Sun May  7 12:21:20 2023
+++ src/crypto/external/bsd/openssl/lib/engines/capi/capi.map	Sun May  7 12:21:19 2023
@@ -0,0 +1,6 @@
+{
+global:
+bind_engine;
+v_check;
+local: *;
+};

Index: src/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map:1.1
--- /dev/null	Sun May  7 12:21:20 2023
+++ src/crypto/external/bsd/openssl/lib/engines/dasync/dasync.map	Sun May  7 12:21:19 2023
@@ -0,0 +1,6 @@
+{
+global:
+bind_engine;
+v_check;
+local: *;
+};

Index: src/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile:1.1
--- /dev/null	Sun May  7 12:21:20 2023
+++ src/crypto/external/bsd/openssl/lib/engines/devcrypto/Makefile	Sun May  7 12:21:19 2023
@@ -0,0 +1,6 @@
+#	$NetBSD: Makefile,v 1.1 2023/05/07 16:21:19 christos Exp $
+
+LIB=	devcrypto
+SRCS=	e_devcrypto.c
+
+.include "../engines.mk"
Index: src/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map
diff -u /dev/null src/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map:1.1
--- /dev/null	Sun May  7 12:21:20 2023
+++ src/crypto/external/bsd/openssl/lib/engines/devcrypto/devcrypto.map	Sun May  7 12:21:19 2023
@@ 

CVS commit: src/crypto/external/bsd/openssl/bin

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 16:19:24 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/bin: Makefile
Added Files:
src/crypto/external/bsd/openssl/bin: progs.c progs.h

Log Message:
make this link


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssl/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/bin/progs.c \
src/crypto/external/bsd/openssl/bin/progs.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/crypto/external/bsd/openssl/bin

2023-05-07 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May  7 16:19:24 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/bin: Makefile
Added Files:
src/crypto/external/bsd/openssl/bin: progs.c progs.h

Log Message:
make this link


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssl/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/bin/progs.c \
src/crypto/external/bsd/openssl/bin/progs.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/crypto/external/bsd/openssl/bin/Makefile
diff -u src/crypto/external/bsd/openssl/bin/Makefile:1.10 src/crypto/external/bsd/openssl/bin/Makefile:1.11
--- src/crypto/external/bsd/openssl/bin/Makefile:1.10	Sun Sep 23 09:32:54 2018
+++ src/crypto/external/bsd/openssl/bin/Makefile	Sun May  7 12:19:24 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2018/09/23 13:32:54 christos Exp $
+#	$NetBSD: Makefile,v 1.11 2023/05/07 16:19:24 christos Exp $
 
 WARNS?=	2	# XXX -Wcast-qual
 
@@ -10,7 +10,7 @@ BINDIR=/usr/bin
 USE_FORT?= yes	# cryptographic software
 
 # RCSid:
-#	$Id: Makefile,v 1.10 2018/09/23 13:32:54 christos Exp $
+#	$Id: Makefile,v 1.11 2023/05/07 16:19:24 christos Exp $
 #
 #	@(#) Copyright (c) 1995 Simon J. Gerraty
 #
@@ -27,23 +27,72 @@ USE_FORT?= yes	# cryptographic software
 
 PROG=	openssl
 
-SRCS=	openssl.c
-SRCS+=	apps.c ecparam.c ec.c pkeyparam.c genpkey.c pkey.c pkeyutl.c ts.c cms.c
-SRCS+=	s_cb.c s_socket.c bf_prefix.c storeutl.c
-SRCS+=	app_rand.c rehash.c
-SRCS+=	verify.c asn1pars.c req.c dgst.c dhparam.c enc.c passwd.c errstr.c \
-	opt.c ca.c \
-	pkcs7.c crl2p7.c crl.c \
-	rsa.c rsautl.c dsa.c dsaparam.c \
-	x509.c genrsa.c gendsa.c prime.c s_server.c s_client.c speed.c \
-	s_time.c version.c sess_id.c srp.c \
-	ciphers.c nseq.c pkcs12.c pkcs8.c spkac.c smime.c rand.c engine.c ocsp.c
+SRCS+= \
+asn1parse.c \
+ca.c \
+ciphers.c \
+cmp.c \
+cms.c \
+crl.c \
+crl2pkcs7.c \
+dgst.c \
+dhparam.c \
+dsa.c \
+dsaparam.c \
+ec.c \
+ecparam.c \
+enc.c \
+engine.c \
+errstr.c \
+fipsinstall.c \
+gendsa.c \
+genpkey.c \
+genrsa.c \
+info.c \
+kdf.c \
+list.c \
+mac.c \
+nseq.c \
+ocsp.c \
+openssl.c \
+passwd.c \
+pkcs12.c \
+pkcs7.c \
+pkcs8.c \
+pkey.c \
+pkeyparam.c \
+pkeyutl.c \
+prime.c \
+progs.c \
+rand.c \
+rehash.c \
+req.c \
+rsa.c \
+rsautl.c \
+s_client.c \
+s_server.c \
+s_time.c \
+sess_id.c \
+smime.c \
+speed.c \
+spkac.c \
+srp.c \
+storeutl.c \
+ts.c \
+verify.c \
+version.c \
+x509.c \
+
+CPPFLAGS+= -DMONOLITH -DUSE_SSL -I${OPENSSLSRC} -I${.CURDIR}
+CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/apps/include
+
+PROGDPLIBSSTATIC=yes
+PROGDPLIBS+=apps ${OPENSSLSRC}/../lib/libapps
+PROGDPLIBS+=ssl ${OPENSSLSRC}/../lib/libssl
+PROGDPLIBS+=crypto ${OPENSSLSRC}/../lib/libcrypto
 
-CPPFLAGS+= -DMONOLITH -DUSE_SSL -I${OPENSSLSRC}
-CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/../include
-
-LDADD+=	-lssl -lcrypto -lcrypt
-DPADD+=	${LIBSSL} ${LIBCRYPTO} ${LIBCRYPT}
+LDADD+=	-lcrypt
+DPADD+=	${LIBCRYPT}
 
 CRYPTODIST=	${NETBSDSRCDIR}/crypto
 .include "${NETBSDSRCDIR}/crypto/Makefile.openssl"

Added files:

Index: src/crypto/external/bsd/openssl/bin/progs.c
diff -u /dev/null src/crypto/external/bsd/openssl/bin/progs.c:1.1
--- /dev/null	Sun May  7 12:19:24 2023
+++ src/crypto/external/bsd/openssl/bin/progs.c	Sun May  7 12:19:24 2023
@@ -0,0 +1,397 @@
+/*
+ * WARNING: do not edit!
+ * Generated by apps/progs.pl
+ *
+ * Copyright 1995-2023 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
+ * in the file LICENSE in the source distribution or at
+ * https://www.openssl.org/source/license.html
+ */
+
+#include "progs.h"
+
+FUNCTION functions[] = {
+{FT_general, "asn1parse", asn1parse_main, asn1parse_options, NULL, NULL},
+{FT_general, "ca", ca_main, ca_options, NULL, NULL},
+#ifndef OPENSSL_NO_SOCK
+{FT_general, "ciphers", ciphers_main, ciphers_options, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_CMP
+{FT_general, "cmp", cmp_main, cmp_options, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_CMS
+{FT_general, "cms", cms_main, cms_options, NULL, NULL},
+#endif
+{FT_general, "crl", crl_main, crl_options, NULL, NULL},
+{FT_general, "crl2pkcs7", crl2pkcs7_main, crl2pkcs7_options, NULL, NULL},
+{FT_general, "dgst", dgst_main, dgst_options, NULL, NULL},
+#ifndef OPENSSL_NO_DH
+{FT_general, "dhparam", dhparam_main, dhparam_options, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_DSA
+{FT_general, "dsa", dsa_main, dsa_options, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_DSA
+{FT_general, "dsaparam", dsaparam_main, dsaparam_options, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_EC
+{FT_general, "ec", ec_main, ec_options, NULL, NULL},
+#endif
+#ifndef OPENSSL_NO_EC
+{FT_general, "ecparam", 

CVS commit: src/usr.sbin/wgconfig

2023-05-07 Thread Greg Oster
Module Name:src
Committed By:   oster
Date:   Sun May  7 16:05:07 UTC 2023

Modified Files:
src/usr.sbin/wgconfig: wgconfig.c

Log Message:
Don't allow "wgconfig add peer ..." to accept invalid options.

Addresses PR bin/57392 .


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/wgconfig/wgconfig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/usr.sbin/wgconfig

2023-05-07 Thread Greg Oster
Module Name:src
Committed By:   oster
Date:   Sun May  7 16:05:07 UTC 2023

Modified Files:
src/usr.sbin/wgconfig: wgconfig.c

Log Message:
Don't allow "wgconfig add peer ..." to accept invalid options.

Addresses PR bin/57392 .


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/wgconfig/wgconfig.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.sbin/wgconfig/wgconfig.c
diff -u src/usr.sbin/wgconfig/wgconfig.c:1.5 src/usr.sbin/wgconfig/wgconfig.c:1.6
--- src/usr.sbin/wgconfig/wgconfig.c:1.5	Fri Aug 28 17:17:53 2020
+++ src/usr.sbin/wgconfig/wgconfig.c	Sun May  7 16:05:07 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: wgconfig.c,v 1.5 2020/08/28 17:17:53 tih Exp $	*/
+/*	$NetBSD: wgconfig.c,v 1.6 2023/05/07 16:05:07 oster Exp $	*/
 
 /*
  * Copyright (C) Ryota Ozaki 
@@ -30,7 +30,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: wgconfig.c,v 1.5 2020/08/28 17:17:53 tih Exp $");
+__RCSID("$NetBSD: wgconfig.c,v 1.6 2023/05/07 16:05:07 oster Exp $");
 
 #include 
 
@@ -680,14 +680,18 @@ handle_options(int argc, char *argv[], p
 {
 
 	while (argc > 0) {
+		int found = 0;
 		for (size_t i = 0; i < __arraycount(options); i++) {
 			const struct option *opt = [i];
 			size_t optlen = strlen(opt->option);
 			if (strncmp(argv[0], opt->option, optlen) == 0) {
 opt->func(argv[0] + optlen, prop_dict);
+found = 1;
 break;
 			}
 		}
+		if (found == 0)
+			errx(EXIT_FAILURE, "invalid option: %s", argv[0]);
 		argc -= 1;
 		argv += 1;
 	}



CVS commit: src/doc

2023-05-07 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun May  7 12:43:32 UTC 2023

Modified Files:
src/doc: HACKS

Log Message:
Not hacks to use old binutils (2.34 instead of 2.39) on mips64*
(but not mipsn64*).


To generate a diff of this commit:
cvs rdiff -u -r1.235 -r1.236 src/doc/HACKS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/HACKS
diff -u src/doc/HACKS:1.235 src/doc/HACKS:1.236
--- src/doc/HACKS:1.235	Sun Jan 22 20:41:25 2023
+++ src/doc/HACKS	Sun May  7 12:43:32 2023
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.235 2023/01/22 20:41:25 christos Exp $
+# $NetBSD: HACKS,v 1.236 2023/05/07 12:43:32 martin Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -747,6 +747,16 @@ port	mips
 		Add COPTS.count.c+=-Wa,--no-warn to avoid -Wa,--fatal-warnings
 	kcah
 
+	hack	mips-use-binutils-old
+	cdate	Sun May  7 14:28:55 CEST 2023
+	who	martin
+	file	src/share/mk/bsd.own.mk : 1.1311, 1.1308
+	descr
+		Use binutils.old for 64bit mips with 32bit userland.
+		Version 2.39 causes random (cross-) build failures
+		that are hard to reproduce or analyze.
+	kcah
+
 port	i386
 
 	hack	use volatile intermediate variable to enforce rounding



CVS commit: src/doc

2023-05-07 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun May  7 12:43:32 UTC 2023

Modified Files:
src/doc: HACKS

Log Message:
Not hacks to use old binutils (2.34 instead of 2.39) on mips64*
(but not mipsn64*).


To generate a diff of this commit:
cvs rdiff -u -r1.235 -r1.236 src/doc/HACKS

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src

2023-05-07 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Sun May  7 12:41:49 UTC 2023

Modified Files:
src/common/lib/libc/arch/riscv/atomic: atomic_sub_64.S
src/etc/etc.riscv: Makefile.inc
src/external/gpl3/gdb.old/dist/bfd: configure configure.ac
src/external/gpl3/gdb.old/dist/gdb: configure.host configure.nat
configure.tgt
src/external/gpl3/gdb/dist/bfd: configure configure.ac
src/external/gpl3/gdb/dist/gdb: configure.nat configure.tgt
src/lib/csu/arch/riscv: crt0.S
src/lib/libc/arch/riscv: SYS.h
src/lib/libc/arch/riscv/gen: __setjmp14.S fpgetmask.c fpgetround.c
fpgetsticky.c fpsetmask.c fpsetround.c fpsetsticky.c makecontext.c
src/lib/libc/arch/riscv/sys: __sigtramp2.S __syscall.S brk.S fork.S
getcontext.S ptrace.S sbrk.S
src/lib/libc/stdlib: jemalloc.c
src/lib/libm/arch/riscv: fenv.c
src/lib/libpthread/arch/riscv: pthread_md.h
src/libexec/ld.elf_so/arch/riscv: mdreloc.c rtld_start.S
src/share/mk: bsd.kmodule.mk bsd.own.mk
src/sys/arch/riscv/conf: GENERIC Makefile.riscv files.riscv
majors.riscv std.riscv64
src/sys/arch/riscv/fdt: fdt_dma_machdep.c
src/sys/arch/riscv/include: asm.h bus_defs.h bus_funcs.h cdefs.h cpu.h
db_machdep.h frame.h intr.h loadfile_machdep.h locore.h machdep.h
mcontext.h param.h pcb.h pmap.h proc.h pte.h sysreg.h types.h
vmparam.h
src/sys/arch/riscv/riscv: autoconf.c bus_space.c bus_space_generic.S
bus_space_notimpl.S clock_machdep.c core_machdep.c cpu_switch.S
db_disasm.c db_trace.c fpu.c genassym.cf kobj_machdep.c locore.S
mainbus.c pmap_machdep.c process_machdep.c riscv_machdep.c
sig_machdep.c softint_machdep.c spl.S syscall.c trap.c vm_machdep.c
src/sys/dev/fdt: cpus.c
src/sys/dev/usb: udl.c
src/sys/external/bsd/compiler_rt/dist/lib/builtins: clzdi2.c ctzdi2.c
src/sys/modules: Makefile
src/tests/lib/libc/gen: t_siginfo.c
Added Files:
src/distrib/sets/lists/debug: module.ad.riscv32 module.ad.riscv64
src/distrib/sets/lists/modules: ad.riscv32 ad.riscv64
src/distrib/utils/embedded/conf: riscv.conf riscv32.conf riscv64.conf
src/external/gpl3/gdb.old/dist/gdb: riscv-nbsd-nat.c riscv-nbsd-tdep.c
riscv-nbsd-tdep.h
src/external/gpl3/gdb/dist/gdb: riscv-nbsd-nat.c riscv-nbsd-tdep.c
riscv-nbsd-tdep.h
src/sys/arch/riscv/conf: GENERIC.common GENERIC64 files.generic
files.generic64
src/sys/arch/riscv/dev: plic.c plic_fdt.c plicreg.h plicvar.h
src/sys/arch/riscv/fdt: clint_fdt.c cpu_fdt.c fdt_cpus_machdep.c
files.fdt intc_fdt.c riscv_platform.c
src/sys/arch/riscv/include: cpufunc.h cpuvar.h sbi.h
src/sys/arch/riscv/riscv: bus_dma.c bus_stubs.c cpu.c interrupt.c
riscv_generic_dma.c sbi.c
src/tests/lib/csu/arch/riscv: h_initfini_align.S

Log Message:
RISC-V support that works on QEMU with a single hart.

Thanks for Simon Burge for plic(4).


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/common/lib/libc/arch/riscv/atomic/atomic_sub_64.S
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/debug/module.ad.riscv32 \
src/distrib/sets/lists/debug/module.ad.riscv64
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/modules/ad.riscv32 \
src/distrib/sets/lists/modules/ad.riscv64
cvs rdiff -u -r0 -r1.1 src/distrib/utils/embedded/conf/riscv.conf \
src/distrib/utils/embedded/conf/riscv32.conf \
src/distrib/utils/embedded/conf/riscv64.conf
cvs rdiff -u -r1.3 -r1.4 src/etc/etc.riscv/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gdb.old/dist/bfd/configure
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gdb.old/dist/bfd/configure.ac
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gdb.old/dist/gdb/configure.host \
src/external/gpl3/gdb.old/dist/gdb/configure.tgt
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gdb.old/dist/gdb/configure.nat
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb.old/dist/gdb/riscv-nbsd-nat.c \
src/external/gpl3/gdb.old/dist/gdb/riscv-nbsd-tdep.c \
src/external/gpl3/gdb.old/dist/gdb/riscv-nbsd-tdep.h
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gdb/dist/bfd/configure
cvs rdiff -u -r1.1.1.6 -r1.2 src/external/gpl3/gdb/dist/bfd/configure.ac
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/configure.nat
cvs rdiff -u -r1.26 -r1.27 src/external/gpl3/gdb/dist/gdb/configure.tgt
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/dist/gdb/riscv-nbsd-nat.c \
src/external/gpl3/gdb/dist/gdb/riscv-nbsd-tdep.c \
src/external/gpl3/gdb/dist/gdb/riscv-nbsd-tdep.h
cvs rdiff -u -r1.2 -r1.3 src/lib/csu/arch/riscv/crt0.S
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/riscv/SYS.h
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/arch/riscv/gen/__setjmp14.S
cvs rdiff -u -r1.2 -r1.3 

CVS commit: src/share/mk

2023-05-07 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun May  7 12:26:32 UTC 2023

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Switch mips64eb back to old binutils too, with new binutils it causes
random autobuild failures (same reason mips64el had been switched back
before)


To generate a diff of this commit:
cvs rdiff -u -r1.1310 -r1.1311 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src/share/mk

2023-05-07 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Sun May  7 12:26:32 UTC 2023

Modified Files:
src/share/mk: bsd.own.mk

Log Message:
Switch mips64eb back to old binutils too, with new binutils it causes
random autobuild failures (same reason mips64el had been switched back
before)


To generate a diff of this commit:
cvs rdiff -u -r1.1310 -r1.1311 src/share/mk/bsd.own.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1310 src/share/mk/bsd.own.mk:1.1311
--- src/share/mk/bsd.own.mk:1.1310	Tue Apr 18 20:11:34 2023
+++ src/share/mk/bsd.own.mk	Sun May  7 12:26:32 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.1310 2023/04/18 20:11:34 christos Exp $
+#	$NetBSD: bsd.own.mk,v 1.1311 2023/05/07 12:26:32 martin Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -98,7 +98,7 @@ MKGCCCMDS?=	no
 #
 # What binutils is used?
 #
-.if ${MACHINE_ARCH} != "mips64el"
+.if ${MACHINE_ARCH} != "mips64el" && ${MACHINE_ARCH} != "mips64eb"
 HAVE_BINUTILS?=	239
 .else
 HAVE_BINUTILS?=	234



CVS commit: src

2023-05-07 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sun May  7 11:41:49 UTC 2023

Modified Files:
src/share/man/man4/man4.sandpoint: satmgr.4
src/usr.sbin/altq/altqstat: quip_client.c

Log Message:
s/inferface/interface/


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.sandpoint/satmgr.4
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/altq/altqstat/quip_client.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.



CVS commit: src

2023-05-07 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Sun May  7 11:41:49 UTC 2023

Modified Files:
src/share/man/man4/man4.sandpoint: satmgr.4
src/usr.sbin/altq/altqstat: quip_client.c

Log Message:
s/inferface/interface/


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/man4.sandpoint/satmgr.4
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/altq/altqstat/quip_client.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/man4.sandpoint/satmgr.4
diff -u src/share/man/man4/man4.sandpoint/satmgr.4:1.5 src/share/man/man4/man4.sandpoint/satmgr.4:1.6
--- src/share/man/man4/man4.sandpoint/satmgr.4:1.5	Sun Jan 15 20:27:58 2012
+++ src/share/man/man4/man4.sandpoint/satmgr.4	Sun May  7 11:41:49 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: satmgr.4,v 1.5 2012/01/15 20:27:58 wiz Exp $
+.\" $NetBSD: satmgr.4,v 1.6 2023/05/07 11:41:49 andvar Exp $
 .\"
 .\" Copyright (c) 2011-2012 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -112,7 +112,7 @@ Set the temperature above which the fan 
 .Sh FILES
 .Bl -tag -width /dev/satmgrX -compact
 .It Pa /dev/satmgr
-communication inferface to
+communication interface to
 .Nm .
 .It Pa /dev/power
 event notify channel to

Index: src/usr.sbin/altq/altqstat/quip_client.c
diff -u src/usr.sbin/altq/altqstat/quip_client.c:1.14 src/usr.sbin/altq/altqstat/quip_client.c:1.15
--- src/usr.sbin/altq/altqstat/quip_client.c:1.14	Fri Feb  7 21:53:20 2020
+++ src/usr.sbin/altq/altqstat/quip_client.c	Sun May  7 11:41:49 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: quip_client.c,v 1.14 2020/02/07 21:53:20 fox Exp $	*/
+/*	$NetBSD: quip_client.c,v 1.15 2023/05/07 11:41:49 andvar Exp $	*/
 /*	$KAME: quip_client.c,v 1.9 2003/05/17 05:59:00 itojun Exp $	*/
 /*
  * Copyright (C) 1999-2000
@@ -310,7 +310,7 @@ quip_selectinterface(char *ifname)
 	if (server == NULL)
 		return (ifname);
 
-	/* get an inferface list from the server */
+	/* get an interface list from the server */
 	quip_sendrequest(server, "GET list?*\n");
 
 	result_code = quip_recvresponse(server, NULL, buf, );