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

2024-03-20 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Wed Mar 20 13:50:51 UTC 2024

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto: crypto.expsym

Log Message:
libcrypto: Add expected symbol list to check at build-time.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/crypto.expsym

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-10-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed Oct 25 17:17:57 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/dist: Configure
src/crypto/external/bsd/openssl/dist/apps: ca.c cmp.c req.c s_client.c
s_server.c speed.c
src/crypto/external/bsd/openssl/dist/apps/lib: apps.c
src/crypto/external/bsd/openssl/dist/crypto: arm_arch.h ex_data.c mem.c
threads_pthread.c
src/crypto/external/bsd/openssl/dist/crypto/asn1: asn_mime.c
src/crypto/external/bsd/openssl/dist/crypto/dh: dh_lib.c
src/crypto/external/bsd/openssl/dist/crypto/dsa: dsa_lib.c
src/crypto/external/bsd/openssl/dist/crypto/engine: eng_lib.c
src/crypto/external/bsd/openssl/dist/crypto/evp: evp_enc.c
src/crypto/external/bsd/openssl/dist/crypto/lhash: lhash.c
src/crypto/external/bsd/openssl/dist/crypto/rsa: rsa_lib.c
src/crypto/external/bsd/openssl/dist/ssl: ssl_lib.c ssl_sess.c t1_lib.c
src/crypto/external/bsd/openssl/dist/test: dhtest.c evp_extra_test.c
evp_test.c rsa_test.c
src/crypto/external/bsd/openssl/dist/test/testutil: main.c provider.c
src/crypto/external/bsd/openssl/include/openssl: opensslv.h
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: Makefile
aesv8-armx.S ghashv8-armx.S poly1305-armv8.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: bsaes-armv7.S
poly1305-armv8.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto/man: ADMISSIONS.3
ASN1_EXTERN_FUNCS.3 ASN1_INTEGER_get_int64.3 ASN1_INTEGER_new.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_aux_cb.3 ASN1_generate_nconf.3
ASN1_item_d2i_bio.3 ASN1_item_new.3 ASN1_item_sign.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_prefix.3 BIO_f_readbuffer.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_core.3
BIO_s_datagram.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
BIO_socket_wait.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_exp_mont.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_EncryptedData_decrypt.3
CMS_EncryptedData_encrypt.3 CMS_EnvelopedData_create.3
CMS_add0_cert.3 CMS_add1_recipient_cert.3 CMS_add1_signer.3
CMS_compress.3 CMS_data_create.3 CMS_decrypt.3 CMS_digest_create.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 CRYPTO_memcmp.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 ECDSA_sign.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_new.3 ERR_print_errors.3 ERR_put_error.3 ERR_remove_state.3
ERR_set_mark.3 EVP_ASYM_CIPHER-RSA.7 EVP_ASYM_CIPHER-SM2.7
EVP_ASYM_CIPHER_free.3 EVP_BytesToKey.3 EVP_CIPHER-AES.7
EVP_CIPHER-ARIA.7 EVP_CIPHER-BLOWFISH.7 EVP_CIPHER-CAMELLIA.7
EVP_CIPHER-CAST.7 EVP_CIPHER-CHACHA.7 EVP_CIPHER-DES.7
EVP_CIPHER-IDEA.7 

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

2023-09-02 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Sep  2 20:07:32 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/dist/crypto: sparccpuid.S

Log Message:
fix SPARC v8/v9 detection code.

this code uses a trick where the encoding on both v8 and v9 are
the same, and are not illegal instructions, but that the v9 one
has a detectable difference than v8.

the idea is that we perform a "subcc" (set condition codes) which
sets "%ccr" on v9, which is an unimplemented "%asr2" on v8, then
we read %ccr (v9) or %asr2 (v8), which will always be 0x99 on v9,
and .. is non-trapping but impleentation defined on v8.

for many implementations this returns the value of the %y reg.

as nothing actually sets %y in this path, it remains the value it
was most recently set to by something (anything), and if it just
happens to be 0x99 then the v9 paths will be taken on v8.

fix this by clearing the %y register before the potential read.

fixes PR port-sparc/57594.  tested on ss20 and in qemu.  this
version of the patch has been submitted upstream.

XXX: pullup-10, pullup-9, pullup-8.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/dist/crypto/sparccpuid.S

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/dist/crypto/sparccpuid.S
diff -u src/crypto/external/bsd/openssl/dist/crypto/sparccpuid.S:1.10 src/crypto/external/bsd/openssl/dist/crypto/sparccpuid.S:1.11
--- src/crypto/external/bsd/openssl/dist/crypto/sparccpuid.S:1.10	Sun May  7 18:40:16 2023
+++ src/crypto/external/bsd/openssl/dist/crypto/sparccpuid.S	Sat Sep  2 20:07:32 2023
@@ -47,10 +47,14 @@ OPENSSL_wipe_cpu:
 	subcc	%g0,1,%o0
 	! Following is V9 "rd %ccr,%o0" instruction. However! V8
 	! specification says that it ("rd %asr2,%o0" in V8 terms) does
-	! not cause illegal_instruction trap. It therefore can be used
-	! to determine if the CPU the code is executing on is V8- or
-	! V9-compliant, as V9 returns a distinct value of 0x99,
-	! "negative" and "borrow" bits set in both %icc and %xcc.
+	! not cause illegal_instruction trap, however it may read from
+	! the %y register. It therefore can be used to determine if the
+	! CPU the code is executing on is V8- or V9-compliant, as V9
+	! returns a distinct value of 0x99, "negative" and "borrow"
+	! bits set in both %icc and %xcc. The %y register needs to be
+	! set away from 0x99 to avoid false-positives matches.
+	! 
+	wr	0, %y
 	.word	0x91408000	!rd	%ccr,%o0
 	cmp	%o0,0x99
 	bne	.v8
@@ -178,6 +182,7 @@ walk_reg_wins:
 OPENSSL_atomic_add:
 #ifndef ABI64
 	subcc	%g0,1,%o2
+	wr	0, %y
 	.word	0x95408000	!rd	%ccr,%o2, see comment above
 	cmp	%o2,0x99
 	be	.v9
@@ -226,7 +231,8 @@ OPENSSL_atomic_add:
 .align	32
 _sparcv9_rdtick:
 	subcc	%g0,1,%o0
-	.word	0x91408000	!rd	%ccr,%o0
+	wr	0, %y
+	.word	0x91408000	!rd	%ccr,%o0, see comment above
 	cmp	%o0,0x99
 	bne	.notick
 	xor	%o0,%o0,%o0
@@ -388,7 +394,8 @@ OPENSSL_cleanse:
 #ifndef ABI64
 	subcc	%g0,1,%g1
 	! see above for explanation
-	.word	0x83408000	!rd	%ccr,%g1
+	wr	0, %y
+	.word	0x83408000	!rd	%ccr,%g1, see comment above
 	cmp	%g1,0x99
 	bne	.v8lot
 	nop



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

2023-09-02 Thread matthew green
Module Name:src
Committed By:   mrg
Date:   Sat Sep  2 20:07:32 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/dist/crypto: sparccpuid.S

Log Message:
fix SPARC v8/v9 detection code.

this code uses a trick where the encoding on both v8 and v9 are
the same, and are not illegal instructions, but that the v9 one
has a detectable difference than v8.

the idea is that we perform a "subcc" (set condition codes) which
sets "%ccr" on v9, which is an unimplemented "%asr2" on v8, then
we read %ccr (v9) or %asr2 (v8), which will always be 0x99 on v9,
and .. is non-trapping but impleentation defined on v8.

for many implementations this returns the value of the %y reg.

as nothing actually sets %y in this path, it remains the value it
was most recently set to by something (anything), and if it just
happens to be 0x99 then the v9 paths will be taken on v8.

fix this by clearing the %y register before the potential read.

fixes PR port-sparc/57594.  tested on ss20 and in qemu.  this
version of the patch has been submitted upstream.

XXX: pullup-10, pullup-9, pullup-8.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/dist/crypto/sparccpuid.S

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/libcrypto

2023-08-21 Thread Palle Lyckegaard
Module Name:src
Committed By:   palle
Date:   Mon Aug 21 18:46:57 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: gen

Log Message:
PR57519: Fix awk script script (escape opening curly) so building with non-gnu 
versions of awk is possible (e.g. Solaris 11.4)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/lib/libcrypto/gen

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/gen
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/gen:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/gen:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/gen:1.3	Thu Jun  8 21:24:00 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/gen	Mon Aug 21 18:46:57 2023
@@ -11,7 +11,7 @@ awk '
 /use OpenSSL/ {
 	next;
 }
-/^{-/ {
+/^\{-/ {
 	next;
 }
 /^-}/ {



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

2023-08-21 Thread Palle Lyckegaard
Module Name:src
Committed By:   palle
Date:   Mon Aug 21 18:46:57 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: gen

Log Message:
PR57519: Fix awk script script (escape opening curly) so building with non-gnu 
versions of awk is possible (e.g. Solaris 11.4)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/lib/libcrypto/gen

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/libcrypto/arch/aarch64

2023-07-08 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Sat Jul  8 23:54:27 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: ec.inc

Log Message:
Sprinkle OPENSSL_NO_EC_NISTP_64_GCC_128 for aarch64eb.

Otherwise, the following tests fail with wrong results:

- crypto/libcrypto/t_ciphers:evp
- crypto/libcrypto/t_pubkey:ec

Official document says ec_nistp_64_gcc_128 does not support big endian:
https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-ec_nistp_64_gcc_128
Thanks @a_rin for pointing this out on Twitter!

Note that an equivalent hack was present in openssl.old for aarch64eb,
alpha, and sparc64. But:

- alpha received upstream fix (PR lib/55701)
- sparc64 has been fixed differently (PR port-sparc64/57472)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.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/libcrypto/arch/aarch64

2023-07-08 Thread Rin Okuyama
Module Name:src
Committed By:   rin
Date:   Sat Jul  8 23:54:27 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: ec.inc

Log Message:
Sprinkle OPENSSL_NO_EC_NISTP_64_GCC_128 for aarch64eb.

Otherwise, the following tests fail with wrong results:

- crypto/libcrypto/t_ciphers:evp
- crypto/libcrypto/t_pubkey:ec

Official document says ec_nistp_64_gcc_128 does not support big endian:
https://github.com/openssl/openssl/blob/master/INSTALL.md#enable-ec_nistp_64_gcc_128
Thanks @a_rin for pointing this out on Twitter!

Note that an equivalent hack was present in openssl.old for aarch64eb,
alpha, and sparc64. But:

- alpha received upstream fix (PR lib/55701)
- sparc64 has been fixed differently (PR port-sparc64/57472)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.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/libcrypto/arch/aarch64/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc:1.3	Wed May 17 19:09:41 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc	Sat Jul  8 23:54:27 2023
@@ -2,4 +2,7 @@
 ECCPPFLAGS+=-DECP_NISTZ256_ASM
 EC_SRCS += ecp_nistz256-armv8.S
 ECNI = yes
+.if ${MACHINE_ARCH} == "aarch64eb"
+ECCPPFLAGS+=-DOPENSSL_NO_EC_NISTP_64_GCC_128
+.endif
 .include "../../ec.inc"



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

2023-06-27 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Jun 27 07:31:37 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/include/crypto: bn_conf.h
src/crypto/external/bsd/openssl/include/openssl: configuration.h
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: crypto.inc
ec.inc sha.inc

Log Message:
PR 57472: adjust the BIGNUM configuration for sparc64 to match a native
openssl build [internally called bn(64/32)] and make the BN limbs be 32bit.
The sparc64 ASM code only deals with this layout.

Enable all sparc64 optimized asm code and define OPENSSL_NO_EC_NISTP_64_GCC_128
as this optimization is not valid on sparc64 (bigendian, alignement
critical) - again matching the native build.

Analyzed by Taylor and Harold, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/include/crypto/bn_conf.h
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/include/openssl/configuration.h
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha.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/include/crypto/bn_conf.h
diff -u src/crypto/external/bsd/openssl/include/crypto/bn_conf.h:1.2 src/crypto/external/bsd/openssl/include/crypto/bn_conf.h:1.3
--- src/crypto/external/bsd/openssl/include/crypto/bn_conf.h:1.2	Sun May  7 18:41:35 2023
+++ src/crypto/external/bsd/openssl/include/crypto/bn_conf.h	Tue Jun 27 07:31:36 2023
@@ -22,12 +22,15 @@
 /* Should we define BN_DIV2W here? */
 
 /* Only one for the following should be defined */
-#ifdef _LP64
+#if defined(_LP64) && !defined(__sparc64__)	/* sparc64 asm needs 32bit BN limbs */
 #define SIXTY_FOUR_BIT_LONG
 #elif _ILP64
 #define SIXTY_FOUR_BIT
 #else
 #define THIRTY_TWO_BIT
 #endif
+#ifdef __sparc64__
+#define BN_LLONG
+#endif
 
 #endif

Index: src/crypto/external/bsd/openssl/include/openssl/configuration.h
diff -u src/crypto/external/bsd/openssl/include/openssl/configuration.h:1.3 src/crypto/external/bsd/openssl/include/openssl/configuration.h:1.4
--- src/crypto/external/bsd/openssl/include/openssl/configuration.h:1.3	Thu May 11 14:36:11 2023
+++ src/crypto/external/bsd/openssl/include/openssl/configuration.h	Tue Jun 27 07:31:36 2023
@@ -120,7 +120,7 @@ extern "C" {
 #  undef BN_LLONG
 /* Only one for the following should be defined */
 #  undef SIXTY_FOUR_BIT
-#  ifdef __LP64__
+#  if defined(__LP64__) && !defined(__sparc64__)	/* sparc64 asm needs 32bit BN limbs */
 #   define SIXTY_FOUR_BIT_LONG
 #   undef THIRTY_TWO_BIT
 #  else
@@ -128,6 +128,9 @@ extern "C" {
 #   define THIRTY_TWO_BIT
 #  endif
 # endif
+#ifdef __sparc64__
+# define BN_LLONG
+#endif
 
 # define RC4_INT unsigned int
 

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.9 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.10
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc:1.9	Thu May 25 15:52:29 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc	Tue Jun 27 07:31:36 2023
@@ -2,6 +2,9 @@
 CPUID_SRCS = sparcv9cap.c sparccpuid.S sparcv9-mont.S sparcv9a-mont.S
 CPUID_SRCS += sparct4-mont.S vis3-mont.S
 CPUID = yes
-#CPPFLAGS += -DOPENSSL_BN_ASM_MONT
+
+CPPFLAGS += -DOPENSSL_BN_ASM_MONT
+CPUID_SRCS+=bn_sparc.c
+
 CPPFLAGS += -DOPENSSL_CPUID_OBJ
 .include "../../crypto.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc:1.3	Thu May 25 15:52:29 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc	Tue Jun 27 07:31:36 2023
@@ -2,6 +2,7 @@
 EC_SRCS += \
 ecp_nistz256-sparcv9.S
 ECCPPFLAGS+= -DECP_NISTZ256_ASM
-
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
 ECNI = yes
+COPTS.bn_exp.c+=-Wno-error=stack-protector
 .include "../../ec.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha.inc:1.1	Sun Mar  2 08:58:02 2014
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha.inc	Tue Jun 27 07:31:36 2023
@@ -1,4 +1,4 @@
 .PATH.S: ${.PARSEDIR}
-SHA_SRCS = sha1-sparcv9.S
-SHACPPFLAGS = -DSHA1_ASM
+SHA_SRCS = sha1-sparcv9.S sha256-sparcv9.S 

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

2023-06-27 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Jun 27 07:31:37 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/include/crypto: bn_conf.h
src/crypto/external/bsd/openssl/include/openssl: configuration.h
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: crypto.inc
ec.inc sha.inc

Log Message:
PR 57472: adjust the BIGNUM configuration for sparc64 to match a native
openssl build [internally called bn(64/32)] and make the BN limbs be 32bit.
The sparc64 ASM code only deals with this layout.

Enable all sparc64 optimized asm code and define OPENSSL_NO_EC_NISTP_64_GCC_128
as this optimization is not valid on sparc64 (bigendian, alignement
critical) - again matching the native build.

Analyzed by Taylor and Harold, thanks!


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/include/crypto/bn_conf.h
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/include/openssl/configuration.h
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha.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/include/internal

2023-06-27 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Jun 27 07:27:31 UTC 2023

Removed Files:
src/crypto/external/bsd/openssl/include/internal: bn_conf.h dso_conf.h

Log Message:
Remove unused leftovers from earlier versions


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/include/internal/bn_conf.h
cvs rdiff -u -r1.2 -r0 \
src/crypto/external/bsd/openssl/include/internal/dso_conf.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/include/internal

2023-06-27 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Jun 27 07:27:31 UTC 2023

Removed Files:
src/crypto/external/bsd/openssl/include/internal: bn_conf.h dso_conf.h

Log Message:
Remove unused leftovers from earlier versions


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/include/internal/bn_conf.h
cvs rdiff -u -r1.2 -r0 \
src/crypto/external/bsd/openssl/include/internal/dso_conf.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/lib/libcrypto/arch/sparc64

2023-06-27 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Jun 27 07:25:55 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: Makefile
sha512-sparcv9.S
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64:
sha256-sparcv9.S

Log Message:
The sha512 generator perl script can output a sha256 version too, but
needs a special cased invocation to do so. Fix the regen script
and update the output.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha256-sparcv9.S
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha512-sparcv9.S

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/arch/sparc64/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile:1.6	Sun Feb 18 23:38:47 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile	Tue Jun 27 07:25:55 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2018/02/18 23:38:47 christos Exp $
+#	$NetBSD: Makefile,v 1.7 2023/06/27 07:25:55 martin Exp $
 
 .include "bsd.own.mk"
 
@@ -12,6 +12,7 @@ regen:
 		j=$$(basename $$i .pl).S; \
 		case $$j in \
 		sparc*_modes.pl|sha1-*) perl $$i $$j;; \
+		sha512-*) perl $$i $$j; perl $$i $${j:S/512/256/};; \
 		*) perl $$i > $$j;; \
 		esac; \
 	done

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha512-sparcv9.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha512-sparcv9.S:1.8 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha512-sparcv9.S:1.9
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha512-sparcv9.S:1.8	Tue May  9 17:21:17 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha512-sparcv9.S	Tue Jun 27 07:25:55 2023
@@ -11,1938 +11,2348 @@
 .section	".text",#alloc,#execinstr
 
 .align	64
-K256:
-.type	K256,#object
-	.long	0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5
-	.long	0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5
-	.long	0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3
-	.long	0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174
-	.long	0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc
-	.long	0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da
-	.long	0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7
-	.long	0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967
-	.long	0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13
-	.long	0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85
-	.long	0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3
-	.long	0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070
-	.long	0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5
-	.long	0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3
-	.long	0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208
-	.long	0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
-.size	K256,.-K256
+K512:
+.type	K512,#object
+	.long	0x428a2f98,0xd728ae22, 0x71374491,0x23ef65cd
+	.long	0xb5c0fbcf,0xec4d3b2f, 0xe9b5dba5,0x8189dbbc
+	.long	0x3956c25b,0xf348b538, 0x59f111f1,0xb605d019
+	.long	0x923f82a4,0xaf194f9b, 0xab1c5ed5,0xda6d8118
+	.long	0xd807aa98,0xa3030242, 0x12835b01,0x45706fbe
+	.long	0x243185be,0x4ee4b28c, 0x550c7dc3,0xd5ffb4e2
+	.long	0x72be5d74,0xf27b896f, 0x80deb1fe,0x3b1696b1
+	.long	0x9bdc06a7,0x25c71235, 0xc19bf174,0xcf692694
+	.long	0xe49b69c1,0x9ef14ad2, 0xefbe4786,0x384f25e3
+	.long	0x0fc19dc6,0x8b8cd5b5, 0x240ca1cc,0x77ac9c65
+	.long	0x2de92c6f,0x592b0275, 0x4a7484aa,0x6ea6e483
+	.long	0x5cb0a9dc,0xbd41fbd4, 0x76f988da,0x831153b5
+	.long	0x983e5152,0xee66dfab, 0xa831c66d,0x2db43210
+	.long	0xb00327c8,0x98fb213f, 0xbf597fc7,0xbeef0ee4
+	.long	0xc6e00bf3,0x3da88fc2, 0xd5a79147,0x930aa725
+	.long	0x06ca6351,0xe003826f, 0x14292967,0x0a0e6e70
+	.long	0x27b70a85,0x46d22ffc, 0x2e1b2138,0x5c26c926
+	.long	0x4d2c6dfc,0x5ac42aed, 0x53380d13,0x9d95b3df
+	.long	0x650a7354,0x8baf63de, 0x766a0abb,0x3c77b2a8
+	.long	0x81c2c92e,0x47edaee6, 0x92722c85,0x1482353b
+	.long	0xa2bfe8a1,0x4cf10364, 0xa81a664b,0xbc423001
+	.long	0xc24b8b70,0xd0f89791, 0xc76c51a3,0x0654be30
+	.long	0xd192e819,0xd6ef5218, 0xd6990624,0x5565a910
+	.long	0xf40e3585,0x5771202a, 0x106aa070,0x32bbd1b8
+	.long	0x19a4c116,0xb8d2d0c8, 0x1e376c08,0x5141ab53
+	.long	0x2748774c,0xdf8eeb99, 0x34b0bcb5,0xe19b48a8
+	.long	0x391c0cb3,0xc5c95a63, 0x4ed8aa4a,0xe3418acb
+	.long	0x5b9cca4f,0x7763e373, 0x682e6ff3,0xd6b2b8a3
+	.long	0x748f82ee,0x5defb2fc, 0x78a5636f,0x43172f60
+	.long	0x84c87814,0xa1f0ab72, 0x8cc70208,0x1a6439ec
+	.long	0x90befffa,0x23631e28, 0xa4506ceb,0xde82bde9
+	.long	0xbef9a3f7,0xb2c67915, 0xc67178f2,0xe372532b
+	.long	0xca273ece,0xea26619c, 

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

2023-06-27 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Jun 27 07:25:55 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: Makefile
sha512-sparcv9.S
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64:
sha256-sparcv9.S

Log Message:
The sha512 generator perl script can output a sha256 version too, but
needs a special cased invocation to do so. Fix the regen script
and update the output.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/Makefile
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha256-sparcv9.S
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/sha512-sparcv9.S

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-06-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Jun 17 15:45:51 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib: Makefile
Added Files:
src/crypto/external/bsd/openssl/lib: Makefile.subdir

Log Message:
Split the SUBDIR variable into a separate Makefile so it can be used
by /usr/src/lib/Makefile


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssl/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/lib/Makefile.subdir

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-06-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Jun 17 15:45:51 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib: Makefile
Added Files:
src/crypto/external/bsd/openssl/lib: Makefile.subdir

Log Message:
Split the SUBDIR variable into a separate Makefile so it can be used
by /usr/src/lib/Makefile


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssl/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssl/lib/Makefile.subdir

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.8 src/crypto/external/bsd/openssl/lib/Makefile:1.9
--- src/crypto/external/bsd/openssl/lib/Makefile:1.8	Fri May 26 18:27:50 2023
+++ src/crypto/external/bsd/openssl/lib/Makefile	Sat Jun 17 11:45:51 2023
@@ -1,11 +1,7 @@
-#	$NetBSD: Makefile,v 1.8 2023/05/26 22:27:50 riastradh Exp $
+#	$NetBSD: Makefile,v 1.9 2023/06/17 15:45:51 christos Exp $
 
 .include "bsd.own.mk"
 
-# OpenSSL libraries.
-SUBDIR= libapps libcommon libcrypto libcryptotest libdes
-
-SUBDIR+= .WAIT	libssl liblegacy	# depends on libcrypto, libcommon
-SUBDIR+= engines
+.include "Makefile.subdir"
 
 .include 

Added files:

Index: src/crypto/external/bsd/openssl/lib/Makefile.subdir
diff -u /dev/null src/crypto/external/bsd/openssl/lib/Makefile.subdir:1.1
--- /dev/null	Sat Jun 17 11:45:51 2023
+++ src/crypto/external/bsd/openssl/lib/Makefile.subdir	Sat Jun 17 11:45:51 2023
@@ -0,0 +1,8 @@
+#	$NetBSD: Makefile.subdir,v 1.1 2023/06/17 15:45:51 christos Exp $
+
+# OpenSSL libraries.
+SUBDIR+= ${OSSL}libapps ${OSSL}libcommon ${OSSL}libcrypto
+SUBDIR+= ${OSSL}libcryptotest ${OSSL}libdes
+
+SUBDIR+= .WAIT	${OSSL}libssl ${OSSL}liblegacy	# depends on libcrypto, libcommon
+SUBDIR+= ${OSSL}engines



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

2023-06-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Jun  8 21:24:01 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: gen

Log Message:
don't assume that the root directory of CVS is called src (Jan-Benedict Glaw)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/lib/libcrypto/gen

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/gen
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/gen:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/gen:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/gen:1.2	Thu May 25 11:52:28 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/gen	Thu Jun  8 17:24:00 2023
@@ -3,9 +3,9 @@
 awk '
 /- join\(/ {
 	printf(" * WARNING: do not edit!\n");
-	i = index(FILENAME, "/src/crypto/external");
+	i = index(FILENAME, "/crypto/external");
 	s = substr(FILENAME, i);
-	printf(" * Generated by Makefile from /usr%s\n", s);
+	printf(" * Generated by Makefile from /usr/src%s\n", s);
 	next;
 }
 /use OpenSSL/ {



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

2023-06-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu Jun  8 21:24:01 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: gen

Log Message:
don't assume that the root directory of CVS is called src (Jan-Benedict Glaw)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/lib/libcrypto/gen

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/libcrypto

2023-05-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 31 20:57:31 UTC 2023

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

Log Message:
fix the build


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/lib/libcrypto/bn.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/libcrypto/bn.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/bn.inc:1.9 src/crypto/external/bsd/openssl/lib/libcrypto/bn.inc:1.10
--- src/crypto/external/bsd/openssl/lib/libcrypto/bn.inc:1.9	Sat May  6 13:07:22 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/bn.inc	Wed May 31 16:57:31 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: bn.inc,v 1.9 2023/05/06 17:07:22 christos Exp $
+#	$NetBSD: bn.inc,v 1.10 2023/05/31 20:57:31 christos Exp $
 
 .PATH:	${OPENSSLSRC}/crypto/bn
 
@@ -37,7 +37,6 @@ bn_sqrt.c \
 bn_srp.c \
 bn_word.c \
 bn_x931p.c \
-rsa_sup_mul.c \
 rsaz_exp.c \
 rsaz_exp_x2.c \
 



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

2023-05-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 31 20:57:31 UTC 2023

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

Log Message:
fix the build


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/lib/libcrypto/bn.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/include/openssl

2023-05-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 31 20:43:28 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/include/openssl: opensslv.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/include/openssl/opensslv.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/include/openssl/opensslv.h
diff -u src/crypto/external/bsd/openssl/include/openssl/opensslv.h:1.1 src/crypto/external/bsd/openssl/include/openssl/opensslv.h:1.2
--- src/crypto/external/bsd/openssl/include/openssl/opensslv.h:1.1	Sun May  7 14:41:35 2023
+++ src/crypto/external/bsd/openssl/include/openssl/opensslv.h	Wed May 31 16:43:28 2023
@@ -29,7 +29,7 @@ extern "C" {
  */
 # define OPENSSL_VERSION_MAJOR  3
 # define OPENSSL_VERSION_MINOR  0
-# define OPENSSL_VERSION_PATCH  8
+# define OPENSSL_VERSION_PATCH  9
 
 /*
  * Additional version information
@@ -74,21 +74,21 @@ extern "C" {
  * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and
  * OPENSSL_VERSION_BUILD_METADATA_STR appended.
  */
-# define OPENSSL_VERSION_STR "3.0.8"
-# define OPENSSL_FULL_VERSION_STR "3.0.8"
+# define OPENSSL_VERSION_STR "3.0.9"
+# define OPENSSL_FULL_VERSION_STR "3.0.9"
 
 /*
  * SECTION 3: ADDITIONAL METADATA
  *
  * These strings are defined separately to allow them to be parsable.
  */
-# define OPENSSL_RELEASE_DATE "7 Feb 2023"
+# define OPENSSL_RELEASE_DATE "30 May 2023"
 
 /*
  * SECTION 4: BACKWARD COMPATIBILITY
  */
 
-# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.8 7 Feb 2023"
+# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.9 30 May 2023"
 
 /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */
 # ifdef OPENSSL_VERSION_PRE_RELEASE



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

2023-05-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 31 20:43:28 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/include/openssl: opensslv.h

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/include/openssl/opensslv.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/lib/libcrypto

2023-05-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 31 19:42:44 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: man.inc
src/crypto/external/bsd/openssl/lib/libcrypto/man: ADMISSIONS.3
ASN1_EXTERN_FUNCS.3 ASN1_INTEGER_get_int64.3 ASN1_INTEGER_new.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_aux_cb.3 ASN1_generate_nconf.3
ASN1_item_d2i_bio.3 ASN1_item_new.3 ASN1_item_sign.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_prefix.3 BIO_f_readbuffer.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_core.3
BIO_s_datagram.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
BIO_socket_wait.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_exp_mont.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_EncryptedData_decrypt.3
CMS_EncryptedData_encrypt.3 CMS_EnvelopedData_create.3
CMS_add0_cert.3 CMS_add1_recipient_cert.3 CMS_add1_signer.3
CMS_compress.3 CMS_data_create.3 CMS_decrypt.3 CMS_digest_create.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 CRYPTO_memcmp.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 ECDSA_sign.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_new.3 ERR_print_errors.3 ERR_put_error.3 ERR_remove_state.3
ERR_set_mark.3 EVP_ASYM_CIPHER-RSA.7 EVP_ASYM_CIPHER-SM2.7
EVP_ASYM_CIPHER_free.3 EVP_BytesToKey.3 EVP_CIPHER-AES.7
EVP_CIPHER-ARIA.7 EVP_CIPHER-BLOWFISH.7 EVP_CIPHER-CAMELLIA.7
EVP_CIPHER-CAST.7 EVP_CIPHER-CHACHA.7 EVP_CIPHER-DES.7
EVP_CIPHER-IDEA.7 EVP_CIPHER-RC2.7 EVP_CIPHER-RC4.7
EVP_CIPHER-RC5.7 EVP_CIPHER-SEED.7 EVP_CIPHER-SM4.7
EVP_CIPHER_CTX_get_cipher_data.3 EVP_CIPHER_CTX_get_original_iv.3
EVP_CIPHER_meth_new.3 EVP_DigestInit.3 EVP_DigestSignInit.3
EVP_DigestVerifyInit.3 EVP_EncodeInit.3 EVP_EncryptInit.3
EVP_KDF-HKDF.7 EVP_KDF-KB.7 EVP_KDF-KRB5KDF.7 EVP_KDF-PBKDF1.7
EVP_KDF-PBKDF2.7 EVP_KDF-PKCS12KDF.7 EVP_KDF-SCRYPT.7 EVP_KDF-SS.7
EVP_KDF-SSHKDF.7 EVP_KDF-TLS13_KDF.7 EVP_KDF-TLS1_PRF.7
EVP_KDF-X942-ASN1.7 EVP_KDF-X942-CONCAT.7 EVP_KDF-X963.7 EVP_KDF.3
EVP_KEM-RSA.7 EVP_KEM_free.3 EVP_KEYEXCH-DH.7 EVP_KEYEXCH-ECDH.7
EVP_KEYEXCH-X25519.7 EVP_KEYEXCH_free.3 EVP_KEYMGMT.3
EVP_MAC-BLAKE2.7 EVP_MAC-CMAC.7 EVP_MAC-GMAC.7 EVP_MAC-HMAC.7
EVP_MAC-KMAC.7 EVP_MAC-Poly1305.7 EVP_MAC-Siphash.7 EVP_MAC.3
EVP_MD-BLAKE2.7 EVP_MD-MD2.7 EVP_MD-MD4.7 EVP_MD-MD5-SHA1.7
EVP_MD-MD5.7 EVP_MD-MDC2.7 EVP_MD-RIPEMD160.7 EVP_MD-SHA1.7
EVP_MD-SHA2.7 EVP_MD-SHA3.7 EVP_MD-SHAKE.7 EVP_MD-SM3.7
EVP_MD-WHIRLPOOL.7 EVP_MD-common.7 EVP_MD_meth_new.3 EVP_OpenInit.3
EVP_PBE_CipherInit.3 EVP_PKEY-DH.7 EVP_PKEY-DSA.7 EVP_PKEY-EC.7
EVP_PKEY-FFC.7 EVP_PKEY-HMAC.7 EVP_PKEY-RSA.7 EVP_PKEY-SM2.7
EVP_PKEY-X25519.7 EVP_PKEY2PKCS8.3 

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

2023-05-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 31 19:35:31 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64:
aes-gcm-armv8_64.S aesv8-armx.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm:
aes-gcm-armv8_64.S bsaes-armv7.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc:
ecp_nistp521-ppc64.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64:
ecp_nistp521-ppc64.S

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aes-gcm-armv8_64.S
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aesv8-armx.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-gcm-armv8_64.S
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S
cvs rdiff -u -r1.1 -r1.2 \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ecp_nistp521-ppc64.S
cvs rdiff -u -r1.1 -r1.2 \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ecp_nistp521-ppc64.S

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/libcrypto/arch

2023-05-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 31 19:35:31 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64:
aes-gcm-armv8_64.S aesv8-armx.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm:
aes-gcm-armv8_64.S bsaes-armv7.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc:
ecp_nistp521-ppc64.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64:
ecp_nistp521-ppc64.S

Log Message:
regen


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aes-gcm-armv8_64.S
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aesv8-armx.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-gcm-armv8_64.S
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S
cvs rdiff -u -r1.1 -r1.2 \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ecp_nistp521-ppc64.S
cvs rdiff -u -r1.1 -r1.2 \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ecp_nistp521-ppc64.S

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/arch/aarch64/aes-gcm-armv8_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aes-gcm-armv8_64.S:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aes-gcm-armv8_64.S:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aes-gcm-armv8_64.S:1.2	Wed May 10 21:31:54 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aes-gcm-armv8_64.S	Wed May 31 15:35:31 2023
@@ -19,28 +19,36 @@ aes_gcm_enc_128_kernel:
 	stp	d14, d15, [sp, #96]
 
 	ldp	x10, x11, [x16]  //ctr96_b64, ctr96_t32
+#ifdef __AARCH64EB__
+	rev	x10, x10
+	rev	x11, x11
+#endif
 	ldp	x13, x14, [x8, #160] //load rk10
-
+#ifdef __AARCH64EB__
+	ror	x13, x13, #32
+	ror	x14, x14, #32
+#endif
 	ld1	{v11.16b}, [x3]
 	ext	v11.16b, v11.16b, v11.16b, #8
 	rev64	v11.16b, v11.16b
 	lsr	x5, x1, #3  //byte_len
 	mov	x15, x5
 
-	ldr	q27, [x8, #144]//load rk9
+	ld1	{v18.4s}, [x8], #16  //load rk0
 	add	x4, x0, x1, lsr #3   //end_input_ptr
 	sub	x5, x5, #1  //byte_len - 1
 
 	lsr	x12, x11, #32
 	ldr	q15, [x3, #112]//load h4l | h4h
+#ifndef __AARCH64EB__
 	ext	v15.16b, v15.16b, v15.16b, #8
-
+#endif
 	fmov	d1, x10   //CTR block 1
 	rev	w12, w12//rev_ctr32
 
 	add	w12, w12, #1//increment rev_ctr32
 	orr	w11, w11, w11
-	ldr	q18, [x8, #0]  //load rk0
+	ld1	{v19.4s}, [x8], #16  //load rk1
 
 	rev	w9, w12 //CTR block 1
 	add	w12, w12, #1//CTR block 1
@@ -60,30 +68,33 @@ aes_gcm_enc_128_kernel:
 	rev	w9, w12 //CTR block 3
 
 	orr	x9, x11, x9, lsl #32//CTR block 3
-	ldr	q19, [x8, #16] //load rk1
+	ld1	{v20.4s}, [x8], #16  //load rk2
 
 	add	w12, w12, #1//CTR block 3
 	fmov	v3.d[1], x9   //CTR block 3
 
 	ldr	q14, [x3, #80] //load h3l | h3h
+#ifndef __AARCH64EB__
 	ext	v14.16b, v14.16b, v14.16b, #8
-
+#endif
 	aese	v1.16b, v18.16b
 	aesmc	v1.16b, v1.16b  //AES block 1 - round 0
-	ldr	q20, [x8, #32] //load rk2
+	ld1	{v21.4s}, [x8], #16  //load rk3
 
 	aese	v2.16b, v18.16b
 	aesmc	v2.16b, v2.16b  //AES block 2 - round 0
 	ldr	q12, [x3, #32] //load h1l | h1h
+#ifndef __AARCH64EB__
 	ext	v12.16b, v12.16b, v12.16b, #8
+#endif
 
 	aese	v0.16b, v18.16b
 	aesmc	v0.16b, v0.16b  //AES block 0 - round 0
-	ldr	q26, [x8, #128]//load rk8
+	ld1	{v22.4s}, [x8], #16  //load rk4
 
 	aese	v3.16b, v18.16b
 	aesmc	v3.16b, v3.16b  //AES block 3 - round 0
-	ldr	q21, [x8, #48] //load rk3
+	ld1	{v23.4s}, [x8], #16  //load rk5
 
 	aese	v2.16b, v19.16b
 	aesmc	v2.16b, v2.16b  //AES block 2 - round 1
@@ -91,11 +102,11 @@ aes_gcm_enc_128_kernel:
 
 	aese	v0.16b, v19.16b
 	aesmc	v0.16b, v0.16b  //AES block 0 - round 1
-	ldr	q24, [x8, #96] //load rk6
+	ld1	{v24.4s}, [x8], #16  //load rk6
 
 	aese	v1.16b, v19.16b
 	aesmc	v1.16b, v1.16b  //AES block 1 - round 1
-	ldr	q25, [x8, #112]//load rk7
+	ld1	{v25.4s}, [x8], #16  //load rk7
 
 	aese	v3.16b, v19.16b
 	aesmc	v3.16b, v3.16b  //AES block 3 - round 1
@@ -103,12 +114,14 @@ 

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

2023-05-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 31 19:30:30 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/dist: Configure
src/crypto/external/bsd/openssl/dist/apps: cmp.c openssl.cnf s_server.c
src/crypto/external/bsd/openssl/dist/apps/lib: apps.c
src/crypto/external/bsd/openssl/dist/crypto/asn1: asn_pack.c
src/crypto/external/bsd/openssl/dist/crypto/bio: bio_lib.c
src/crypto/external/bsd/openssl/dist/crypto/bn: bn_lib.c bn_nist.c
src/crypto/external/bsd/openssl/dist/crypto/conf: conf_def.c
src/crypto/external/bsd/openssl/dist/crypto/engine: eng_lib.c
src/crypto/external/bsd/openssl/dist/crypto/ui: ui_lib.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
src/crypto/external/bsd/openssl/dist/ssl: ssl_sess.c t1_lib.c
src/crypto/external/bsd/openssl/dist/test: destest.c dsatest.c
ecdsatest.c evp_extra_test.c
src/crypto/external/bsd/openssl/dist/test/testutil: provider.c
Removed Files:
src/crypto/external/bsd/openssl/dist/crypto/bn: rsa_sup_mul.c

Log Message:
merge conflicts between 3.0.8 and 3.0.9


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssl/dist/Configure
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/apps/cmp.c
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/dist/apps/openssl.cnf
cvs rdiff -u -r1.27 -r1.28 \
src/crypto/external/bsd/openssl/dist/apps/s_server.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/apps/lib/apps.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_pack.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_nist.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/crypto/external/bsd/openssl/dist/crypto/bn/rsa_sup_mul.c
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/dist/crypto/engine/eng_lib.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/crypto/ui/ui_lib.c
cvs rdiff -u -r1.27 -r1.28 \
src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/engines/e_padlock.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/dist/include/internal/refcount.h
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/dist/ssl/ssl_sess.c
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/test/destest.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/test/dsatest.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/test/ecdsatest.c
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssl/dist/test/evp_extra_test.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/test/testutil/provider.c

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/dist/Configure
diff -u src/crypto/external/bsd/openssl/dist/Configure:1.32 src/crypto/external/bsd/openssl/dist/Configure:1.33
--- src/crypto/external/bsd/openssl/dist/Configure:1.32	Sun May  7 14:40:15 2023
+++ src/crypto/external/bsd/openssl/dist/Configure	Wed May 31 15:30:28 2023
@@ -1423,7 +1423,7 @@ if ($target =~ /^mingw/ && `$config{CC} 
 }
 
 if ($target =~ /linux.*-mips/ && !$disabled{asm}
-&& !grep { $_ !~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) {
+&& !grep { $_ =~ /-m(ips|arch=)/ } (@{$config{CFLAGS}})) {
 # minimally required architecture flags for assembly modules
 my $value;
 $value = '-mips2' if ($target =~ /mips32/);

Index: src/crypto/external/bsd/openssl/dist/apps/cmp.c
diff -u src/crypto/external/bsd/openssl/dist/apps/cmp.c:1.2 src/crypto/external/bsd/openssl/dist/apps/cmp.c:1.3
--- src/crypto/external/bsd/openssl/dist/apps/cmp.c:1.2	Sun May  7 14:40:15 2023
+++ src/crypto/external/bsd/openssl/dist/apps/cmp.c	Wed May 31 15:30:28 2023
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2007-2023 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright Nokia 2007-2019
  * Copyright Siemens AG 2015-2019
  *
@@ -158,6 +158,7 @@ static char *opt_reqin = NULL;
 static int opt_reqin_new_tid = 0;
 static char *opt_reqout = NULL;
 static char *opt_rspin = NULL;
+static int rspin_in_use = 0;
 static char *opt_rspout = NULL;
 static int 

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

2023-05-31 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 31 19:30:30 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/dist: Configure
src/crypto/external/bsd/openssl/dist/apps: cmp.c openssl.cnf s_server.c
src/crypto/external/bsd/openssl/dist/apps/lib: apps.c
src/crypto/external/bsd/openssl/dist/crypto/asn1: asn_pack.c
src/crypto/external/bsd/openssl/dist/crypto/bio: bio_lib.c
src/crypto/external/bsd/openssl/dist/crypto/bn: bn_lib.c bn_nist.c
src/crypto/external/bsd/openssl/dist/crypto/conf: conf_def.c
src/crypto/external/bsd/openssl/dist/crypto/engine: eng_lib.c
src/crypto/external/bsd/openssl/dist/crypto/ui: ui_lib.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
src/crypto/external/bsd/openssl/dist/ssl: ssl_sess.c t1_lib.c
src/crypto/external/bsd/openssl/dist/test: destest.c dsatest.c
ecdsatest.c evp_extra_test.c
src/crypto/external/bsd/openssl/dist/test/testutil: provider.c
Removed Files:
src/crypto/external/bsd/openssl/dist/crypto/bn: rsa_sup_mul.c

Log Message:
merge conflicts between 3.0.8 and 3.0.9


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/openssl/dist/Configure
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/apps/cmp.c
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/dist/apps/openssl.cnf
cvs rdiff -u -r1.27 -r1.28 \
src/crypto/external/bsd/openssl/dist/apps/s_server.c
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/dist/apps/lib/apps.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/dist/crypto/asn1/asn_pack.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/crypto/bio/bio_lib.c
cvs rdiff -u -r1.16 -r1.17 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_lib.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/crypto/bn/bn_nist.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/crypto/external/bsd/openssl/dist/crypto/bn/rsa_sup_mul.c
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/dist/crypto/conf/conf_def.c
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/dist/crypto/engine/eng_lib.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/crypto/ui/ui_lib.c
cvs rdiff -u -r1.27 -r1.28 \
src/crypto/external/bsd/openssl/dist/crypto/x509/x509_vfy.c
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/dist/engines/e_padlock.c
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/dist/include/internal/refcount.h
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/dist/ssl/ssl_sess.c
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssl/dist/ssl/t1_lib.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/test/destest.c
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssl/dist/test/dsatest.c
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/dist/test/ecdsatest.c
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssl/dist/test/evp_extra_test.c
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/test/testutil/provider.c

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-27 Thread Harold Gutch
Module Name:src
Committed By:   hgutch
Date:   Sat May 27 20:51:22 UTC 2023

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

Log Message:
Explicitly run openssl's "gen" script in a shell

The script has permissions 755 in the repo but ends up with permissions
644 in the source sets, therefore we cannot invoke it simply as
path/to/gen .


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.17 -r1.18 \
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.32 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.33
--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.32	Thu May 25 19:12:06 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile	Sat May 27 20:51:22 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.32 2023/05/25 19:12:06 riastradh Exp $
+#	$NetBSD: Makefile,v 1.33 2023/05/27 20:51:22 hgutch Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -279,7 +279,7 @@ x509v3.h
 .for i in ${GENH}
 $i: $i.in
 	${_MKTARGET_CREATE}
-	${.CURDIR}/gen ${.ALLSRC} > ${.TARGET}
+	${HOST_SH} ${.CURDIR}/gen ${.ALLSRC} > ${.TARGET}
 .endfor
 
 .include 

Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.17 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.18
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.17	Thu May 25 19:12:06 2023
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile	Sat May 27 20:51:22 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.17 2023/05/25 19:12:06 riastradh Exp $
+#	$NetBSD: Makefile,v 1.18 2023/05/27 20:51:22 hgutch Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -58,7 +58,7 @@ ssl.h
 .for i in ${GENH}
 $i: $i.in
 	${_MKTARGET_CREATE}
-	${.CURDIR}/../libcrypto/gen ${.ALLSRC} > ${.TARGET}
+	${HOST_SH} ${.CURDIR}/../libcrypto/gen ${.ALLSRC} > ${.TARGET}
 .endfor
 
 .include 



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

2023-05-27 Thread Harold Gutch
Module Name:src
Committed By:   hgutch
Date:   Sat May 27 20:51:22 UTC 2023

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

Log Message:
Explicitly run openssl's "gen" script in a shell

The script has permissions 755 in the repo but ends up with permissions
644 in the source sets, therefore we cannot invoke it simply as
path/to/gen .


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.17 -r1.18 \
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/engines/capi

2023-05-26 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat May 27 02:30:40 UTC 2023

Removed Files:
src/crypto/external/bsd/openssl/lib/engines/capi: Makefile capi.map

Log Message:
openssl: Delete capi makefiles -- not likely to ever see use here.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r0 \
src/crypto/external/bsd/openssl/lib/engines/capi/Makefile
cvs rdiff -u -r1.3 -r0 \
src/crypto/external/bsd/openssl/lib/engines/capi/capi.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/capi

2023-05-26 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat May 27 02:30:40 UTC 2023

Removed Files:
src/crypto/external/bsd/openssl/lib/engines/capi: Makefile capi.map

Log Message:
openssl: Delete capi makefiles -- not likely to ever see use here.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r0 \
src/crypto/external/bsd/openssl/lib/engines/capi/Makefile
cvs rdiff -u -r1.3 -r0 \
src/crypto/external/bsd/openssl/lib/engines/capi/capi.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-26 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Fri May 26 23:13:37 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/engines: engines.mk

Log Message:
openssl: Link engines against libcrypto so they can be loaded.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/engines/engines.mk

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-26 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Fri May 26 23:13:37 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/engines: engines.mk

Log Message:
openssl: Link engines against libcrypto so they can be loaded.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/engines/engines.mk

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/engines.mk
diff -u src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.5 src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.6
--- src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.5	Fri May 26 22:26:10 2023
+++ src/crypto/external/bsd/openssl/lib/engines/engines.mk	Fri May 26 23:13:37 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: engines.mk,v 1.5 2023/05/26 22:26:10 riastradh Exp $
+#	$NetBSD: engines.mk,v 1.6 2023/05/26 23:13:37 riastradh Exp $
 
 NOLINT=		# don't build a lint library
 NOPROFILE=	# don't build a profile library
@@ -15,6 +15,8 @@ CRYPTODIST= ${NETBSDSRCDIR}/crypto
 
 CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/../include
 
+LIBDPLIBS+=crypto ${.CURDIR}/../../libcrypto
+
 LIBDIR=${OSSL_ENGINESDIR}
 
 .if ${MKPIC} != "no"



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

2023-05-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 25 17:20:15 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/dist/apps/include: apps.h
src/crypto/external/bsd/openssl/dist/apps/lib: apps.c

Log Message:
add a little const to help clang


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl/dist/apps/include/apps.h
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/apps/lib/apps.c

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/dist/apps

2023-05-25 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 25 17:20:15 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/dist/apps/include: apps.h
src/crypto/external/bsd/openssl/dist/apps/lib: apps.c

Log Message:
add a little const to help clang


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl/dist/apps/include/apps.h
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/dist/apps/lib/apps.c

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/dist/apps/include/apps.h
diff -u src/crypto/external/bsd/openssl/dist/apps/include/apps.h:1.1.1.1 src/crypto/external/bsd/openssl/dist/apps/include/apps.h:1.2
--- src/crypto/external/bsd/openssl/dist/apps/include/apps.h:1.1.1.1	Sun May  7 14:29:13 2023
+++ src/crypto/external/bsd/openssl/dist/apps/include/apps.h	Thu May 25 13:20:14 2023
@@ -218,7 +218,7 @@ typedef struct ca_db_st {
 # endif
 } CA_DB;
 
-void app_bail_out(char *fmt, ...);
+void app_bail_out(const char *fmt, ...);
 void *app_malloc(size_t sz, const char *what);
 
 /* load_serial, save_serial, and rotate_serial are also used for CRL numbers */

Index: src/crypto/external/bsd/openssl/dist/apps/lib/apps.c
diff -u src/crypto/external/bsd/openssl/dist/apps/lib/apps.c:1.2 src/crypto/external/bsd/openssl/dist/apps/lib/apps.c:1.3
--- src/crypto/external/bsd/openssl/dist/apps/lib/apps.c:1.2	Sun May  7 14:40:15 2023
+++ src/crypto/external/bsd/openssl/dist/apps/lib/apps.c	Thu May 25 13:20:14 2023
@@ -614,7 +614,7 @@ EVP_PKEY *load_keyparams(const char *uri
 return load_keyparams_suppress(uri, format, maybe_stdin, keytype, desc, 0);
 }
 
-void app_bail_out(char *fmt, ...)
+void app_bail_out(const char *fmt, ...)
 {
 va_list args;
 



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

2023-05-25 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Thu May 25 16:05:28 UTC 2023

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

Log Message:
openssl: Suppress clang warnings for using string literals as char *.

Not sure this is actually forbidden by the C standard.  There may be
bugs lurking here, but OpenSSL uses this extensively, so let's just
get the build going again.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/lib/libapps/Makefile
cvs rdiff -u -r1.30 -r1.31 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.15 -r1.16 \
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-25 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Thu May 25 16:05:28 UTC 2023

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

Log Message:
openssl: Suppress clang warnings for using string literals as char *.

Not sure this is actually forbidden by the C standard.  There may be
bugs lurking here, but OpenSSL uses this extensively, so let's just
get the build going again.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/lib/libapps/Makefile
cvs rdiff -u -r1.30 -r1.31 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.15 -r1.16 \
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/libapps/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.4 src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.5
--- src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.4	Thu May 25 15:52:28 2023
+++ src/crypto/external/bsd/openssl/lib/libapps/Makefile	Thu May 25 16:05:27 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2023/05/25 15:52:28 riastradh Exp $
+#	$NetBSD: Makefile,v 1.5 2023/05/25 16:05:27 riastradh Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -33,6 +33,9 @@ CPPFLAGS+= -I${OPENSSLSRC}/../include
 CPPFLAGS+= -I${OPENSSLSRC}/apps/lib
 CPPFLAGS+= -I${OPENSSLSRC}/apps/include
 
+# OpenSSL extensively uses string literals as char *, which clang
+# (reasonably if not exactly rightly) objects to.
+CWARNFLAGS.clang+=-Wno-error=incompatible-pointer-types-discards-qualifiers
 
 CRYPTODIST=	${NETBSDSRCDIR}/crypto
 OPENSSLINC=	${OPENSSLSRC}/include/openssl

Index: src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.30 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.31
--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.30	Thu May 25 15:52:28 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile	Thu May 25 16:05:28 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.30 2023/05/25 15:52:28 riastradh Exp $
+#	$NetBSD: Makefile,v 1.31 2023/05/25 16:05:28 riastradh Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -31,6 +31,10 @@ CPPFLAGS+= -I${OPENSSLSRC}/crypto/asn1 -
 CPPFLAGS+= -I${OPENSSLSRC}/crypto/modes
 CPPFLAGS+= -I${OPENSSLSRC}/../include
 
+# OpenSSL extensively uses string literals as char *, which clang
+# (reasonably if not exactly rightly) objects to.
+CWARNFLAGS.clang+=-Wno-error=incompatible-pointer-types-discards-qualifiers
+
 CRYPTODIST=	${NETBSDSRCDIR}/crypto
 OPENSSLINC=	${OPENSSLSRC}/include/openssl
 

Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.15 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.16
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.15	Thu May 25 15:52:29 2023
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile	Thu May 25 16:05:28 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2023/05/25 15:52:29 riastradh Exp $
+#	$NetBSD: Makefile,v 1.16 2023/05/25 16:05:28 riastradh Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -24,6 +24,10 @@ CWARNFLAGS.clang+=	-Wno-unused-value
 # XXX: This warning seems to trigger incorrectly
 CWARNFLAGS.clang+=	-Wno-atomic-alignment
 
+# OpenSSL extensively uses string literals as char *, which clang
+# (reasonably if not exactly rightly) objects to.
+CWARNFLAGS.clang+=-Wno-error=incompatible-pointer-types-discards-qualifiers
+
 LIB=	ssl
 CPPFLAGS+= -Dlib${LIB} -I${OPENSSLSRC} -I${OPENSSLSRC}/crypto
 CPPFLAGS+= -I${OPENSSLSRC}/include



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

2023-05-25 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Thu May 25 15:52:30 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/engines: engines.mk
src/crypto/external/bsd/openssl/lib/libapps: Makefile
src/crypto/external/bsd/openssl/lib/libcommon: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile bf.inc gen
libc-sha256.c libc-sha512.c mkinc rc4.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: crypto.inc
ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: crypto.inc
ec.inc sha.inc
src/crypto/external/bsd/openssl/lib/libcrypto/man: Makefile
src/crypto/external/bsd/openssl/lib/libdefault: Makefile
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile
src/crypto/external/bsd/openssl/lib/libssl: Makefile statem.inc

Log Message:
openssl: Nix trailing whitespace in build goo.

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/engines/engines.mk
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/lib/libapps/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcommon/Makefile
cvs rdiff -u -r1.29 -r1.30 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/lib/libcrypto/bf.inc
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libcrypto/gen \
src/crypto/external/bsd/openssl/lib/libcrypto/mkinc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha256.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha512.c \
src/crypto/external/bsd/openssl/lib/libcrypto/rc4.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libdefault/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/lib/libssl/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libssl/statem.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/engines/engines.mk
diff -u src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.2 src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.3
--- src/crypto/external/bsd/openssl/lib/engines/engines.mk:1.2	Sun May  7 16:21:19 2023
+++ src/crypto/external/bsd/openssl/lib/engines/engines.mk	Thu May 25 15:52:28 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: engines.mk,v 1.2 2023/05/07 16:21:19 christos Exp $
+#	$NetBSD: engines.mk,v 1.3 2023/05/25 15:52:28 riastradh Exp $
 
 NOLINT=		# don't build a lint library
 NOPROFILE=	# don't build a profile library
@@ -14,7 +14,7 @@ CRYPTODIST= ${NETBSDSRCDIR}/crypto
 .PATH: ${OPENSSLSRC}/engines
 
 CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/../include
- 
+
 LIBDIR=${OSSL_ENGINESDIR}
 
 .if ${MKPIC} != "no"

Index: src/crypto/external/bsd/openssl/lib/libapps/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.3 src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.4
--- src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.3	Tue May 23 12:04:42 2023
+++ src/crypto/external/bsd/openssl/lib/libapps/Makefile	Thu May 25 15:52:28 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2023/05/23 12:04:42 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2023/05/25 15:52:28 riastradh Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -8,10 +8,10 @@
 #	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 
+#	use this file is hereby granted provided that
 #	the above 

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

2023-05-25 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Thu May 25 15:52:30 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/engines: engines.mk
src/crypto/external/bsd/openssl/lib/libapps: Makefile
src/crypto/external/bsd/openssl/lib/libcommon: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile bf.inc gen
libc-sha256.c libc-sha512.c mkinc rc4.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: crypto.inc
ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: crypto.inc
ec.inc sha.inc
src/crypto/external/bsd/openssl/lib/libcrypto/man: Makefile
src/crypto/external/bsd/openssl/lib/libdefault: Makefile
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile
src/crypto/external/bsd/openssl/lib/libssl: Makefile statem.inc

Log Message:
openssl: Nix trailing whitespace in build goo.

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/engines/engines.mk
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssl/lib/libapps/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcommon/Makefile
cvs rdiff -u -r1.29 -r1.30 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/lib/libcrypto/bf.inc
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libcrypto/gen \
src/crypto/external/bsd/openssl/lib/libcrypto/mkinc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha256.c
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/libc-sha512.c \
src/crypto/external/bsd/openssl/lib/libcrypto/rc4.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/crypto.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/crypto.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libdefault/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/lib/libssl/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libssl/statem.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

2023-05-23 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 23 12:04:42 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libapps: Makefile
src/crypto/external/bsd/openssl/lib/libcommon: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile
src/crypto/external/bsd/openssl/lib/libdefault: Makefile
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile

Log Message:
centralie warnings


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/lib/libapps/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcommon/Makefile
cvs rdiff -u -r1.28 -r1.29 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libdefault/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/liblegacy/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/libapps/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.2 src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.3
--- src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.2	Wed May 17 15:09:41 2023
+++ src/crypto/external/bsd/openssl/lib/libapps/Makefile	Tue May 23 08:04:42 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2023/05/17 19:09:41 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2023/05/23 12:04:42 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,17 +25,6 @@ USE_FIPS=	no
 .include 
 .include 
 
-CWARNFLAGS.clang+=	-Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion
-# XXX: This warning seems to trigger incorrectly
-CWARNFLAGS.clang+=	-Wno-atomic-alignment
-
-LINTFLAGS+=	-X 161	# constant in conditional context
-LINTFLAGS+=	-X 129	# expression has null effect
-LINTFLAGS+=	-X 117	# bitwise '>>' on signed value possibly nonportable
-LINTFLAGS+=	-X 231	# argument '%s' unused in function '%s'
-LINTFLAGS+=	-X 220	# fallthrough on case statement
-LINTFLAGS+=	-X 118	# semantics of '%s' change in ANSI C; use explicit cast
-
 CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto -I${OPENSSLSRC} -I${.CURDIR}
 CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/crypto/include
 CPPFLAGS+= -I${OPENSSLSRC}/crypto/asn1 -I${OPENSSLSRC}/crypto/evp

Index: src/crypto/external/bsd/openssl/lib/libcommon/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.3 src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.4
--- src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.3	Wed May 17 15:09:41 2023
+++ src/crypto/external/bsd/openssl/lib/libcommon/Makefile	Tue May 23 08:04:42 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2023/05/17 19:09:41 christos Exp $
+#	$NetBSD: Makefile,v 1.4 2023/05/23 12:04:42 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,17 +25,6 @@ USE_FIPS=	no
 .include 
 .include 
 
-CWARNFLAGS.clang+=	-Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion
-# XXX: This warning seems to trigger incorrectly
-CWARNFLAGS.clang+=	-Wno-atomic-alignment
-
-LINTFLAGS+=	-X 161	# constant in conditional context
-LINTFLAGS+=	-X 129	# expression has null effect
-LINTFLAGS+=	-X 117	# bitwise '>>' on signed value possibly nonportable
-LINTFLAGS+=	-X 231	# argument '%s' unused in function '%s'
-LINTFLAGS+=	-X 220	# fallthrough on case statement
-LINTFLAGS+=	-X 118	# semantics of '%s' change in ANSI C; use explicit cast
-
 CPPFLAGS+= -Dlib${LIB} -I. -I${OPENSSLSRC}/crypto -I${OPENSSLSRC} -I${.CURDIR}
 CPPFLAGS+= -I${OPENSSLSRC}/include -I${OPENSSLSRC}/crypto/include
 CPPFLAGS+= -I${OPENSSLSRC}/crypto/asn1 -I${OPENSSLSRC}/crypto/evp

Index: src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.28 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.29
--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.28	Wed May 17 15:09:41 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile	Tue May 23 08:04:42 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2023/05/17 19:09:41 christos Exp $
+#	$NetBSD: Makefile,v 1.29 2023/05/23 12:04:42 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,27 +25,12 @@ USE_FIPS=	no
 .include 
 .include 
 
-COPTS+= -Wno-error=cast-qual -Wno-error=discarded-qualifiers
-COPTS+= -Wno-error=missing-field-initializers -Wno-error=char-subscripts
-CWARNFLAGS.clang+=	-Wno-empty-body -Wno-unused-value -Wno-parentheses -Wno-implicit-int-float-conversion
-# XXX: This warning seems to trigger incorrectly
-CWARNFLAGS.clang+=	-Wno-atomic-alignment
-
-LINTFLAGS+=	-X 161	# constant in conditional context
-LINTFLAGS+=	-X 129	# expression has null effect
-LINTFLAGS+=	-X 117	# bitwise '>>' on signed value possibly nonportable
-LINTFLAGS+=	-X 231	# 

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

2023-05-23 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 23 12:04:42 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libapps: Makefile
src/crypto/external/bsd/openssl/lib/libcommon: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile
src/crypto/external/bsd/openssl/lib/libdefault: Makefile
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile

Log Message:
centralie warnings


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl/lib/libapps/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcommon/Makefile
cvs rdiff -u -r1.28 -r1.29 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libdefault/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/liblegacy/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/liblegacy

2023-05-19 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May 19 18:45:53 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile

Log Message:
vax-inate (does not have _pic, .a is pic)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/liblegacy/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/liblegacy

2023-05-19 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May 19 18:45:53 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile

Log Message:
vax-inate (does not have _pic, .a is pic)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/liblegacy/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/liblegacy/Makefile
diff -u src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.4 src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.5
--- src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.4	Wed May 17 15:09:42 2023
+++ src/crypto/external/bsd/openssl/lib/liblegacy/Makefile	Fri May 19 14:45:52 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2023/05/17 19:09:42 christos Exp $
+#	$NetBSD: Makefile,v 1.5 2023/05/19 18:45:52 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -76,7 +76,11 @@ libinstall::
 
 LDFLAGS+=-Wl,--version-script=${.CURDIR}/${LIB}.map
 
+.if ${MKPICLIB} == "yes"
 LIBDPLIBS+= common_pic ${.CURDIR}/../libcommon
+.else
+LIBDPLIBS+= common ${.CURDIR}/../libcommon
+.endif
 LIBDPLIBS+= crypto ${.CURDIR}/../libcrypto
 
 .include 



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

2023-05-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 18 00:27:08 UTC 2023

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32: crypto.inc
ec.inc

Log Message:
fix riscv32


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/crypto.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/ec.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/libcrypto/arch/riscv32

2023-05-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 18 00:27:08 UTC 2023

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32: crypto.inc
ec.inc

Log Message:
fix riscv32


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/crypto.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/ec.inc

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

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/crypto.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/crypto.inc:1.1
--- /dev/null	Wed May 17 20:27:08 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/crypto.inc	Wed May 17 20:27:08 2023
@@ -0,0 +1,4 @@
+
+COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
+
+.include "../../crypto.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/ec.inc:1.1
--- /dev/null	Wed May 17 20:27:08 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv32/ec.inc	Wed May 17 20:27:08 2023
@@ -0,0 +1,3 @@
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
+.include "../../ec.inc"



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

2023-05-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 17 19:09:42 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libapps: Makefile
src/crypto/external/bsd/openssl/lib/libcommon: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: ec.inc
src/crypto/external/bsd/openssl/lib/libdefault: Makefile
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile
src/crypto/external/bsd/openssl/lib/libssl: Makefile

Log Message:
add missing assembly stub macro, remove WARNS=0


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libapps/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcommon/Makefile
cvs rdiff -u -r1.27 -r1.28 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libdefault/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
cvs rdiff -u -r1.13 -r1.14 \
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/libapps/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.1 src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.2
--- src/crypto/external/bsd/openssl/lib/libapps/Makefile:1.1	Sun May  7 12:22:10 2023
+++ src/crypto/external/bsd/openssl/lib/libapps/Makefile	Wed May 17 15:09:41 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2023/05/07 16:22:10 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2023/05/17 19:09:41 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,8 +25,6 @@ USE_FIPS=	no
 .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 seems to trigger incorrectly
 CWARNFLAGS.clang+=	-Wno-atomic-alignment

Index: src/crypto/external/bsd/openssl/lib/libcommon/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.2 src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.3
--- src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.2	Tue May 16 15:06:09 2023
+++ src/crypto/external/bsd/openssl/lib/libcommon/Makefile	Wed May 17 15:09:41 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2023/05/16 19:06:09 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2023/05/17 19:09:41 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,8 +25,6 @@ USE_FIPS=	no
 .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 seems to trigger incorrectly
 CWARNFLAGS.clang+=	-Wno-atomic-alignment

Index: src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.27 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.28
--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.27	Tue May  9 15:22:07 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile	Wed May 17 15:09:41 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.27 2023/05/09 19:22:07 christos Exp $
+#	$NetBSD: Makefile,v 1.28 2023/05/17 19:09:41 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -25,8 +25,8 @@ USE_FIPS=	no
 .include 
 .include 
 
-# XXX: 

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

2023-05-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 17 19:09:42 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libapps: Makefile
src/crypto/external/bsd/openssl/lib/libcommon: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: ec.inc
src/crypto/external/bsd/openssl/lib/libdefault: Makefile
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile
src/crypto/external/bsd/openssl/lib/libssl: Makefile

Log Message:
add missing assembly stub macro, remove WARNS=0


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssl/lib/libapps/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcommon/Makefile
cvs rdiff -u -r1.27 -r1.28 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libdefault/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
cvs rdiff -u -r1.13 -r1.14 \
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/libcrypto/arch/arm

2023-05-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 16 19:22:58 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc

Log Message:
include earm to <=5


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/libcrypto/arch/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.14 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.15
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.14	Tue May 16 05:52:30 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Tue May 16 15:22:58 2023
@@ -1,3 +1,4 @@
+.include "arm.inc"
 .PATH.S: ${.PARSEDIR}
 
 CPUID_SRCS += armv4cpuid.S armcap.c armv4-mont.S armv4-gf2m.S
@@ -5,7 +6,7 @@ CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
 CPPFLAGS += -DOPENSSL_CPUID_OBJ
 
-.if ${MACHINE_ARCH:Nearmv[45]*} == ""
+.if ${ARM_MAX_ARCH} <= 5
 COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
 .endif
 



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

2023-05-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 16 19:22:58 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc

Log Message:
include earm to <=5


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/libcrypto/arch/ia64

2023-05-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 16 19:10:23 UTC 2023

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/ia64: ec.inc

Log Message:
fix ia64


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/ia64/ec.inc

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

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/ia64/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/ia64/ec.inc:1.1
--- /dev/null	Tue May 16 15:10:23 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/ia64/ec.inc	Tue May 16 15:10:23 2023
@@ -0,0 +1,5 @@
+# $NetBSD: ec.inc,v 1.1 2023/05/16 19:10:23 christos Exp $
+ECNI=yes
+ECNONISTZ=yes
+
+.include "../../ec.inc"



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

2023-05-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 16 19:10:23 UTC 2023

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/ia64: ec.inc

Log Message:
fix ia64


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/ia64/ec.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

2023-05-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 16 19:06:09 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcommon: Makefile
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile

Log Message:
use the pic version of the common library (affects hppa/alpha)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcommon/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/liblegacy/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/libcommon/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.1 src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.2
--- src/crypto/external/bsd/openssl/lib/libcommon/Makefile:1.1	Sat May  6 13:07:22 2023
+++ src/crypto/external/bsd/openssl/lib/libcommon/Makefile	Tue May 16 15:06:09 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1 2023/05/06 17:07:22 christos Exp $
+#	$NetBSD: Makefile,v 1.2 2023/05/16 19:06:09 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -15,7 +15,7 @@
 #	Please send copies of changes and bug-fixes to:
 #	s...@quick.com.au
 #
-LIBISPRIVATE=	yes
+LIBISPRIVATE=	pic
 LIB=	common
 USE_FORT?= yes	# cryptographic software
 USE_SHLIBDIR=	no

Index: src/crypto/external/bsd/openssl/lib/liblegacy/Makefile
diff -u src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.2 src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.3
--- src/crypto/external/bsd/openssl/lib/liblegacy/Makefile:1.2	Mon May  8 10:30:34 2023
+++ src/crypto/external/bsd/openssl/lib/liblegacy/Makefile	Tue May 16 15:06:09 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2023/05/08 14:30:34 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2023/05/16 19:06:09 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -78,7 +78,7 @@ libinstall::
 
 LDFLAGS+=-Wl,--version-script=${.CURDIR}/${LIB}.map
 
-LIBDPLIBS+= common ${.CURDIR}/../libcommon
+LIBDPLIBS+= common_pic ${.CURDIR}/../libcommon
 LIBDPLIBS+= crypto ${.CURDIR}/../libcrypto
 
 .include 



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

2023-05-16 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May 16 19:06:09 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcommon: Makefile
src/crypto/external/bsd/openssl/lib/liblegacy: Makefile

Log Message:
use the pic version of the common library (affects hppa/alpha)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcommon/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/liblegacy/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/libcrypto/arch/arm

2023-05-16 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue May 16 18:25:54 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes.inc ec.inc

Log Message:
openssl: Limit armv8 stuff to aarch64.

Strictly speaking there is armv8 aarch32, e.g. AES instructions are
exposed to 32-bit mode, but OpenSSL's `*_armv8.S' files are staunchly
aarch64 and don't work when built for aarch64 32-bit compat libraries
(which could take advantage of armv8 instructions, but only if the
code is actually aarch32, which it isn't).

The armv8 stuff is still included in aarch64 /usr/lib/libcrypto, just
not in the 32-bit compat libraries.

With any luck, this will fix the aarch64 clang build (again).


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.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/libcrypto/arch/arm

2023-05-16 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Tue May 16 18:25:54 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes.inc ec.inc

Log Message:
openssl: Limit armv8 stuff to aarch64.

Strictly speaking there is armv8 aarch32, e.g. AES instructions are
exposed to 32-bit mode, but OpenSSL's `*_armv8.S' files are staunchly
aarch64 and don't work when built for aarch64 32-bit compat libraries
(which could take advantage of armv8 instructions, but only if the
code is actually aarch32, which it isn't).

The armv8 stuff is still included in aarch64 /usr/lib/libcrypto, just
not in the 32-bit compat libraries.

With any luck, this will fix the aarch64 clang build (again).


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.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/libcrypto/arch/arm/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.6	Sun May 14 17:50:29 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc	Tue May 16 18:25:54 2023
@@ -3,10 +3,7 @@
 .PATH.S: ${.PARSEDIR}
 AES_SRCS += aes-armv4.S aes_cbc.c aesv8-armx.S
 
-.if ${ARM_MAX_ARCH} >= 8
-AES_SRCS+=vpaes-armv8.S
-AESCPPFLAGS += -DVPAES_ASM
-.elif ${ARM_MAX_ARCH} >= 7
+.if ${ARM_MAX_ARCH} >= 7
 AES_SRCS+=bsaes-armv7.S
 AESCPPFLAGS += -DBSAES_ASM
 .endif

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.1	Sun May 14 17:50:29 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc	Tue May 16 18:25:54 2023
@@ -1,9 +1,6 @@
 .PATH.S: ${.PARSEDIR}
 
-.if ${ARM_MAX_ARCH} >= 8
-EC_SRCS += ecp_nistz256-armv8.S
-ECNI = yes
-.elif ${ARM_MAX_ARCH} >= 4
+.if ${ARM_MAX_ARCH} >= 4
 EC_SRCS += ecp_nistz256-armv4.S
 ECNI = yes
 .endif



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

2023-05-16 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue May 16 09:52:30 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc

Log Message:
Simplify previous, from Riastradh


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/libcrypto/arch/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.13 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.14
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.13	Mon May 15 14:27:29 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Tue May 16 09:52:30 2023
@@ -5,7 +5,7 @@ CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
 CPPFLAGS += -DOPENSSL_CPUID_OBJ
 
-.if ${MACHINE_ARCH:Nearmv[4,5]*} == ""
+.if ${MACHINE_ARCH:Nearmv[45]*} == ""
 COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
 .endif
 



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

2023-05-16 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue May 16 09:52:30 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc

Log Message:
Simplify previous, from Riastradh


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/libcrypto/arch

2023-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 15 21:55:26 UTC 2023

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv64: ec.inc
Removed Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riskv64: ec.inc

Log Message:
fix typo


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv64/ec.inc
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riskv64/ec.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/libcrypto/arch

2023-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 15 21:55:26 UTC 2023

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv64: ec.inc
Removed Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riskv64: ec.inc

Log Message:
fix typo


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv64/ec.inc
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riskv64/ec.inc

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

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv64/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv64/ec.inc:1.1
--- /dev/null	Mon May 15 17:55:26 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/riscv64/ec.inc	Mon May 15 17:55:26 2023
@@ -0,0 +1,3 @@
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
+.include "../../ec.inc"



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

2023-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 15 21:09:11 UTC 2023

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riskv64: ec.inc

Log Message:
add riskv64 from Robert Swindells


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riskv64/ec.inc

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

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/riskv64/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/riskv64/ec.inc:1.1
--- /dev/null	Mon May 15 17:09:11 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/riskv64/ec.inc	Mon May 15 17:09:10 2023
@@ -0,0 +1,3 @@
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
+.include "../../ec.inc"



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

2023-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 15 21:09:11 UTC 2023

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riskv64: ec.inc

Log Message:
add riskv64 from Robert Swindells


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/riskv64/ec.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/libcrypto/arch/sparc

2023-05-15 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon May 15 17:06:05 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: crypto.inc

Log Message:
32bit sparc needs the atomic hack too


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.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/libcrypto/arch/sparc/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.13 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.14
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc:1.13	Sun Jun 21 22:16:08 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.inc	Mon May 15 17:06:05 2023
@@ -12,4 +12,8 @@ AFLAGS.sparcv9a-mont.S+= -Wa,-Av9a
 AFLAGS.sparct4-mont.S+= -Wa,-Av9a
 AFLAGS.vis3-mont.S+= -Wa,-Av9a
 
+.if ${MACHINE} == "sparc"
+COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
+.endif
+
 .include "../../crypto.inc"



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

2023-05-15 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon May 15 17:06:05 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: crypto.inc

Log Message:
32bit sparc needs the atomic hack too


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/crypto.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/libcrypto/arch

2023-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 15 16:12:03 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3: crypto.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3: ec.inc

Log Message:
fix ppc, sh3


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/ec.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/libcrypto/arch

2023-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 15 16:12:03 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3: crypto.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3: ec.inc

Log Message:
fix ppc, sh3


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/ec.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/libcrypto/arch/sh3/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc:1.2	Mon Sep 24 07:03:40 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/crypto.inc	Mon May 15 12:12:03 2023
@@ -1,3 +1,4 @@
 
-#CRYPTO_SRCS += libc-memequal.c
+COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
+
 .include "../../crypto.inc"

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc:1.1
--- /dev/null	Mon May 15 12:12:03 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ec.inc	Mon May 15 12:12:03 2023
@@ -0,0 +1,3 @@
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
+.include "../../ec.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/ec.inc:1.1
--- /dev/null	Mon May 15 12:12:03 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sh3/ec.inc	Mon May 15 12:12:03 2023
@@ -0,0 +1,3 @@
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
+.include "../../ec.inc"



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

2023-05-15 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon May 15 14:27:29 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc

Log Message:
armv4 also needs the atomic hack


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/libcrypto/arch/arm

2023-05-15 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon May 15 14:27:29 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc

Log Message:
armv4 also needs the atomic hack


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/libcrypto/arch/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.12 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.13
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.12	Mon May 15 14:08:17 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Mon May 15 14:27:29 2023
@@ -5,7 +5,7 @@ CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
 CPPFLAGS += -DOPENSSL_CPUID_OBJ
 
-.if ${MACHINE_ARCH:Nearmv5*} == ""
+.if ${MACHINE_ARCH:Nearmv[4,5]*} == ""
 COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
 .endif
 



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

2023-05-15 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon May 15 14:08:17 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc

Log Message:
Fix armv5


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/libcrypto/arch/arm

2023-05-15 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon May 15 14:08:17 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc

Log Message:
Fix armv5


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.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/libcrypto/arch/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.11 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.12
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.11	Sat May  9 13:16:42 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc	Mon May 15 14:08:17 2023
@@ -5,5 +5,9 @@ CPUID = yes
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
 CPPFLAGS += -DOPENSSL_CPUID_OBJ
 
+.if ${MACHINE_ARCH:Nearmv5*} == ""
+COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
+.endif
+
 .include "../../crypto.inc"
 



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

2023-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 15 14:04:38 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64: bn.inc
chacha.inc ec.inc

Log Message:
fix build


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/bn.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/chacha.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.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/libcrypto/arch/powerpc64

2023-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 15 14:04:38 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64: bn.inc
chacha.inc ec.inc

Log Message:
fix build


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/bn.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/chacha.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.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/libcrypto/arch/powerpc64/bn.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/bn.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/bn.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/bn.inc:1.1	Sat Oct 15 08:19:02 2016
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/bn.inc	Mon May 15 10:04:38 2023
@@ -1,4 +1,4 @@
 .PATH.S: ${.PARSEDIR}
-BN_SRCS = ppc.S ppc-mont.S ppc64-mont.S
+BN_SRCS = ppc.S ppc-mont.S ppc64-mont.S bn_ppc.c
 CPPFLAGS += -DOPENSSL_BN_ASM_MONT
 .include "../../bn.inc"
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/chacha.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/chacha.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/chacha.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/chacha.inc:1.1	Sun Mar  4 11:45:12 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/chacha.inc	Mon May 15 10:04:38 2023
@@ -1,5 +1,5 @@
 .PATH.S: ${.PARSEDIR}
 
-CHACHA_SRCS = chacha-ppc.S
+CHACHA_SRCS = chacha-ppc.S chacha_ppc.c
 
 .include "../../chacha.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc:1.2	Fri Sep 28 13:28:01 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ec.inc	Mon May 15 10:04:38 2023
@@ -1,8 +1,11 @@
 .PATH.S: ${.PARSEDIR}
 EC_SRCS += \
 ecp_nistz256-ppc64.S \
+ecp_nistp521-ppc64.S \
+ecp_ppc.c \
 x25519-ppc64.S 
 
 ECCPPFLAGS+= -DX25519_ASM
+ECNI=yes
 
 .include "../../ec.inc"



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

2023-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 15 13:54:12 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: crypto.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: ec.inc

Log Message:
fix mips


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/ec.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/libcrypto/arch/mips

2023-05-15 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Mon May 15 13:54:12 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: crypto.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: ec.inc

Log Message:
fix mips


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/ec.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/libcrypto/arch/mips/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.8 src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.9
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc:1.8	Mon Apr 26 14:06:09 2021
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/crypto.inc	Mon May 15 09:54:12 2023
@@ -6,4 +6,8 @@
 CRYPTO_SRCS += mips-mont${MIPS_64}.S
 .endif
 
+.if ${MIPS_64} == ""
+COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
+.endif
+
 .include "../../crypto.inc"

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/ec.inc:1.1
--- /dev/null	Mon May 15 09:54:12 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips/ec.inc	Mon May 15 09:54:12 2023
@@ -0,0 +1,3 @@
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
+.include "../../ec.inc"



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

2023-05-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 14 19:52:39 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa: crypto.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa: ec.inc

Log Message:
make things link


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/ec.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/libcrypto/arch/hppa/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc:1.2	Mon Sep 24 07:03:39 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/crypto.inc	Sun May 14 15:52:39 2023
@@ -1,3 +1,5 @@
 
 #CRYPTO_SRCS += libc-memequal.c
+COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
+
 .include "../../crypto.inc"

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/ec.inc:1.1
--- /dev/null	Sun May 14 15:52:39 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/hppa/ec.inc	Sun May 14 15:52:39 2023
@@ -0,0 +1,3 @@
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
+.include "../../ec.inc"



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

2023-05-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 14 17:50:29 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ec.inc

Log Message:
make arm build


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.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/libcrypto/arch/arm/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.5 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.6
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc:1.5	Wed Mar  7 15:38:39 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc	Sun May 14 13:50:29 2023
@@ -1,13 +1,15 @@
 .include "arm.inc"
 
 .PATH.S: ${.PARSEDIR}
-AES_SRCS += aes-armv4.S aes_cbc.c
+AES_SRCS += aes-armv4.S aes_cbc.c aesv8-armx.S
 
-.if ${ARM_MAX_ARCH} >= 7
+.if ${ARM_MAX_ARCH} >= 8
+AES_SRCS+=vpaes-armv8.S
+AESCPPFLAGS += -DVPAES_ASM
+.elif ${ARM_MAX_ARCH} >= 7
 AES_SRCS+=bsaes-armv7.S
-.elif ${ARM_MAX_ARCH} >= 8
-AES_SRCS+=aesv8-armx.S
+AESCPPFLAGS += -DBSAES_ASM
 .endif
 
-AESCPPFLAGS = -DAES_ASM -DBSAES_ASM
+AESCPPFLAGS += -DAES_ASM
 .include "../../aes.inc"

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc:1.1
--- /dev/null	Sun May 14 13:50:29 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.inc	Sun May 14 13:50:29 2023
@@ -0,0 +1,12 @@
+.PATH.S: ${.PARSEDIR}
+
+.if ${ARM_MAX_ARCH} >= 8
+EC_SRCS += ecp_nistz256-armv8.S
+ECNI = yes
+.elif ${ARM_MAX_ARCH} >= 4
+EC_SRCS += ecp_nistz256-armv4.S
+ECNI = yes
+.endif
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
+.include "../../ec.inc"



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

2023-05-14 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sun May 14 17:50:29 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: ec.inc

Log Message:
make arm build


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ec.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/libcrypto

2023-05-13 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May 13 18:59:36 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: ec.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha: ec.inc

Log Message:
fix alpha


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/ec.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/libcrypto

2023-05-13 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May 13 18:59:36 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: ec.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha: ec.inc

Log Message:
fix alpha


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/ec.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/libcrypto/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.11 src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.12
--- src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.11	Thu May 11 16:08:59 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc	Sat May 13 14:59:36 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: ec.inc,v 1.11 2023/05/11 20:08:59 christos Exp $
+#	$NetBSD: ec.inc,v 1.12 2023/05/13 18:59:36 christos Exp $
 
 .PATH:	${OPENSSLSRC}/crypto/ec
 
@@ -36,8 +36,10 @@ ecx_key.c \
 ecx_meth.c \
 
 .if defined(ECNI)
+.if !defined(ECNONISTZ)
 COPTS.ecp_nistz256.c+=-Wno-error=stack-protector
 EC_SRCS+= ecp_nistz256.c
+.endif
 .if empty(ECCPPFLAGS:M*OPENSSL_NO_EC_NISTP_64_GCC_128*)
 EC_SRCS+= ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c
 .endif

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/ec.inc:1.1
--- /dev/null	Sat May 13 14:59:36 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/alpha/ec.inc	Sat May 13 14:59:36 2023
@@ -0,0 +1,5 @@
+# $NetBSD: ec.inc,v 1.1 2023/05/13 18:59:36 christos Exp $
+ECNI=yes
+ECNONISTZ=yes
+
+.include "../../ec.inc"



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

2023-05-13 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May 13 13:43:26 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: crypto.inc
ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k: crypto.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k: ec.inc

Log Message:
fix m68k/i386


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/ec.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/libcrypto/arch

2023-05-13 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat May 13 13:43:26 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: crypto.inc
ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k: crypto.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k: ec.inc

Log Message:
fix m68k/i386


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/ec.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/libcrypto/arch/i386/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc:1.3	Sat May  9 09:16:42 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/crypto.inc	Sat May 13 09:43:25 2023
@@ -2,4 +2,6 @@
 CPUID_SRCS = x86cpuid.S
 CPUID = yes
 CPPFLAGS += -DOPENSSL_CPUID_OBJ
+COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
+
 .include "../../crypto.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.2	Thu May 11 22:23:32 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc	Sat May 13 09:43:25 2023
@@ -2,7 +2,7 @@
 EC_SRCS += \
 ecp_nistz256-x86.S 
 
-ECCPPFLAGS+= -DX25519_ASM -DOPENSSL_NO_EC_NISTP_64_GCC_128
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
 
 ECNI = yes
 .include "../../ec.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc:1.2	Mon Sep 24 07:03:39 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/crypto.inc	Sat May 13 09:43:25 2023
@@ -1,5 +1,4 @@
-.PATH.S: ${.PARSEDIR}
 
-#CRYPTO_SRCS += libc-memequal.c
+COPTS.threads_pthread.c += -DBROKEN_CLANG_ATOMICS   # no atomic 64 bit ops
 
 .include "../../crypto.inc"

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/ec.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/ec.inc:1.1
--- /dev/null	Sat May 13 09:43:26 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/ec.inc	Sat May 13 09:43:25 2023
@@ -0,0 +1,3 @@
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
+.include "../../ec.inc"



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

2023-05-13 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat May 13 11:11:39 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcryptotest: Makefile

Log Message:
libcryptotest: Suppress some warnings.

Detected by clang aarch64 32-bit arm compat library build.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcryptotest/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/libcryptotest/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcryptotest/Makefile:1.4 src/crypto/external/bsd/openssl/lib/libcryptotest/Makefile:1.5
--- src/crypto/external/bsd/openssl/lib/libcryptotest/Makefile:1.4	Sat May  6 17:07:23 2023
+++ src/crypto/external/bsd/openssl/lib/libcryptotest/Makefile	Sat May 13 11:11:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2023/05/06 17:07:23 christos Exp $
+# $NetBSD: Makefile,v 1.5 2023/05/13 11:11:39 riastradh Exp $
 
 LIBISPRIVATE=	yes
 LIB=		cryptotest
@@ -36,4 +36,8 @@ testutil_init.c
 SRCS+= \
 opt.c
 
+COPTS.opt.c+=		-Wno-missing-field-initializers
+COPTS.options.c+=	-Wno-format-nonliteral
+COPTS.test_options.c+=	-Wno-missing-field-initializers
+
 .include 



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

2023-05-13 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat May 13 11:11:39 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcryptotest: Makefile

Log Message:
libcryptotest: Suppress some warnings.

Detected by clang aarch64 32-bit arm compat library build.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcryptotest/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/libcrypto/arch/i386

2023-05-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May 12 02:23:32 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: ec.inc

Log Message:
we don't have int128


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.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/libcrypto/arch/i386/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc:1.1	Fri Feb  9 11:06:59 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.inc	Thu May 11 22:23:32 2023
@@ -2,5 +2,7 @@
 EC_SRCS += \
 ecp_nistz256-x86.S 
 
+ECCPPFLAGS+= -DX25519_ASM -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
 ECNI = yes
 .include "../../ec.inc"



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

2023-05-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri May 12 02:23:32 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: ec.inc

Log Message:
we don't have int128


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386/ec.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/libcrypto

2023-05-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 11 20:09:00 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: chacha.inc ec.inc
whrlpool.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: whrlpool.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax: ec.inc
Removed Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64:
whrlpool.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: chacha.inc
whrlpool.inc

Log Message:
fix vax, restructure.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/whrlpool.inc
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/chacha.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/whrlpool.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/ec.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.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/libcrypto/chacha.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc:1.3	Sat May  6 13:07:22 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc	Thu May 11 16:08:59 2023
@@ -1,8 +1,8 @@
-#	$NetBSD: chacha.inc,v 1.3 2023/05/06 17:07:22 christos Exp $
+#	$NetBSD: chacha.inc,v 1.4 2023/05/11 20:08:59 christos Exp $
 
 .PATH:	${OPENSSLSRC}/crypto/chacha
 
-CHACHA_SRCS += \
+CHACHA_SRCS ?= chacha_enc.c
 
 SRCS += ${CHACHA_SRCS}
 
Index: src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc:1.3	Sat May  6 13:07:23 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc	Thu May 11 16:08:59 2023
@@ -1,7 +1,8 @@
-#	$NetBSD: whrlpool.inc,v 1.3 2023/05/06 17:07:23 christos Exp $
+#	$NetBSD: whrlpool.inc,v 1.4 2023/05/11 20:08:59 christos Exp $
 
 .PATH:	${OPENSSLSRC}/crypto/whrlpool
 
+WHRLPOOL_SRCS ?= wp_block.c
 WHRLPOOL_SRCS += \
 wp_dgst.c \
 

Index: src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.10 src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.11
--- src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.10	Thu May 11 11:26:13 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc	Thu May 11 16:08:59 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: ec.inc,v 1.10 2023/05/11 15:26:13 christos Exp $
+#	$NetBSD: ec.inc,v 1.11 2023/05/11 20:08:59 christos Exp $
 
 .PATH:	${OPENSSLSRC}/crypto/ec
 
@@ -38,8 +38,10 @@ ecx_meth.c \
 .if defined(ECNI)
 COPTS.ecp_nistz256.c+=-Wno-error=stack-protector
 EC_SRCS+= ecp_nistz256.c
+.if empty(ECCPPFLAGS:M*OPENSSL_NO_EC_NISTP_64_GCC_128*)
 EC_SRCS+= ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c
 .endif
+.endif
 
 SRCS += ${EC_SRCS}
 

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc:1.7
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc:1.6	Sun Feb 25 20:33:05 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc	Thu May 11 16:08:59 2023
@@ -8,4 +8,6 @@ AFLAGS.ecp_nistz256-sparcv9.S += -Wa,-Av
 .else
 .endif
 
+ECCPPFLAGS+= -DOPENSSL_NO_EC_NISTP_64_GCC_128
+
 .include "../../ec.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc:1.4	Sat May  9 09:16:42 2020
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc	Thu May 11 16:09:00 2023
@@ -2,5 +2,7 @@
 
 #CRYPTO_SRCS += libc-memequal.c
 #CPPFLAGS += -DOPENSSL_CPUID_OBJ

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

2023-05-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 11 20:09:00 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: chacha.inc ec.inc
whrlpool.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax: crypto.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: whrlpool.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax: ec.inc
Removed Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64:
whrlpool.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: chacha.inc
whrlpool.inc

Log Message:
fix vax, restructure.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/chacha.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/whrlpool.inc
cvs rdiff -u -r1.10 -r1.11 \
src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/whrlpool.inc
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc/ec.inc
cvs rdiff -u -r1.1 -r0 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/chacha.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/whrlpool.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/crypto.inc
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/vax/ec.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/whrlpool.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/libcrypto

2023-05-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 11 15:26:13 UTC 2023

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

Log Message:
fix sparc64


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/lib/libcrypto/ec.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/libcrypto/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.9 src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.10
--- src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.9	Thu May 11 10:36:11 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc	Thu May 11 11:26:13 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: ec.inc,v 1.9 2023/05/11 14:36:11 christos Exp $
+#	$NetBSD: ec.inc,v 1.10 2023/05/11 15:26:13 christos Exp $
 
 .PATH:	${OPENSSLSRC}/crypto/ec
 
@@ -37,7 +37,8 @@ ecx_meth.c \
 
 .if defined(ECNI)
 COPTS.ecp_nistz256.c+=-Wno-error=stack-protector
-EC_SRCS+= ecp_nistz256.c ecp_nistp224.c ecp_nistp521.c ecp_nistputil.c
+EC_SRCS+= ecp_nistz256.c
+EC_SRCS+= ecp_nistp224.c ecp_nistp256.c ecp_nistp521.c ecp_nistputil.c
 .endif
 
 SRCS += ${EC_SRCS}



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

2023-05-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 11 15:26:13 UTC 2023

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

Log Message:
fix sparc64


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/crypto/external/bsd/openssl/lib/libcrypto/ec.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

2023-05-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 11 14:36:12 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/include/openssl: configuration.h
src/crypto/external/bsd/openssl/lib/libcrypto: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: ec.inc
modes.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: ec.inc

Log Message:
changes to get aarch64 to link


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/include/openssl/configuration.h
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.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/include/openssl/configuration.h
diff -u src/crypto/external/bsd/openssl/include/openssl/configuration.h:1.2 src/crypto/external/bsd/openssl/include/openssl/configuration.h:1.3
--- src/crypto/external/bsd/openssl/include/openssl/configuration.h:1.2	Tue May  9 12:41:29 2023
+++ src/crypto/external/bsd/openssl/include/openssl/configuration.h	Thu May 11 10:36:11 2023
@@ -49,9 +49,11 @@ extern "C" {
 # ifndef OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
 #  define OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE
 # endif
+#if 0
 # ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
 #  define OPENSSL_NO_EC_NISTP_64_GCC_128
 # endif
+#endif
 # ifndef OPENSSL_NO_EGD
 #  define OPENSSL_NO_EGD
 # endif

Index: src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.8 src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.9
--- src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc:1.8	Sat May  6 13:07:22 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc	Thu May 11 10:36:11 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: ec.inc,v 1.8 2023/05/06 17:07:22 christos Exp $
+#	$NetBSD: ec.inc,v 1.9 2023/05/11 14:36:11 christos Exp $
 
 .PATH:	${OPENSSLSRC}/crypto/ec
 
@@ -37,7 +37,7 @@ ecx_meth.c \
 
 .if defined(ECNI)
 COPTS.ecp_nistz256.c+=-Wno-error=stack-protector
-EC_SRCS+= ecp_nistz256.c
+EC_SRCS+= ecp_nistz256.c ecp_nistp224.c ecp_nistp521.c ecp_nistputil.c
 .endif
 
 SRCS += ${EC_SRCS}

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc:1.1	Wed Mar  7 11:05:44 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc	Thu May 11 10:36:11 2023
@@ -1,4 +1,4 @@
 .PATH.S: ${.PARSEDIR}
-EC_SRCS += ecp_nistz256-armv8.S 
+EC_SRCS += ecp_nistz256-armv8.S
 ECNI = yes
 .include "../../ec.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc:1.3	Wed May 10 21:31:54 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc	Thu May 11 10:36:11 2023
@@ -1,4 +1,3 @@
 .PATH.S: ${.PARSEDIR}
 MODES_SRCS += ghashv8-armx.S
-MODESCPPFLAGS = -DGHASH_ASM
 .include "../../modes.inc"

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc:1.2 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc:1.3
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc:1.2	Sun Sep 23 09:33:05 2018
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.inc	Thu May 11 10:36:12 2023
@@ -3,7 +3,7 @@ EC_SRCS += \
 ecp_nistz256-x86_64.S \
 x25519-x86_64.S 
 
-ECCPPFLAGS+= -DX25519_ASM
+ECCPPFLAGS+= -DX25519_ASM -DOPENSSL_NO_EC_NISTP_64_GCC_128
 
 ECNI = yes
 .include "../../ec.inc"



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

2023-05-11 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 11 14:36:12 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/include/openssl: configuration.h
src/crypto/external/bsd/openssl/lib/libcrypto: ec.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: ec.inc
modes.inc
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: ec.inc

Log Message:
changes to get aarch64 to link


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/include/openssl/configuration.h
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssl/lib/libcrypto/ec.inc
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ec.inc
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ec.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/libcrypto/arch/sparc64

2023-05-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 11 01:45:39 UTC 2023

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: chacha.inc
whrlpool.inc

Log Message:
add glue to make it link


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/chacha.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/whrlpool.inc

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

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/chacha.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/chacha.inc:1.1
--- /dev/null	Wed May 10 21:45:39 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/chacha.inc	Wed May 10 21:45:38 2023
@@ -0,0 +1,5 @@
+# $NetBSD: chacha.inc,v 1.1 2023/05/11 01:45:38 christos Exp $
+
+CHACHA_SRCS += chacha_enc.c
+.include "../../chacha.inc"
+
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/whrlpool.inc
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/whrlpool.inc:1.1
--- /dev/null	Wed May 10 21:45:39 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/whrlpool.inc	Wed May 10 21:45:38 2023
@@ -0,0 +1,5 @@
+# $NetBSD: whrlpool.inc,v 1.1 2023/05/11 01:45:38 christos Exp $
+
+WHRLPOOL_SRCS += wp_block.c
+.include "../../whrlpool.inc"
+



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

2023-05-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 11 01:45:39 UTC 2023

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64: chacha.inc
whrlpool.inc

Log Message:
add glue to make it link


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/chacha.inc \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64/whrlpool.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/libcrypto/arch/aarch64

2023-05-10 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Thu May 11 01:31:54 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64: Makefile
aes-gcm-armv8_64.S aes.inc aesv8-armx.S ghashv8-armx.S modes.inc
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64:
whrlpool.inc

Log Message:
regen for 64 bit arm and make it link


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/Makefile \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/modes.inc
cvs rdiff -u -r1.1 -r1.2 \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aes-gcm-armv8_64.S
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aes.inc
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aesv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ghashv8-armx.S
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/whrlpool.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/libcrypto

2023-05-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 10 02:23:56 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: man.inc
src/crypto/external/bsd/openssl/lib/libcrypto/man: Makefile
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/man:
openssl-format-options.1 openssl-namedisplay-options.1
openssl-passphrase-options.1 openssl-verification-options.1
Removed Files:
src/crypto/external/bsd/openssl/lib/libcrypto/man:
openssl_openssl-format-options.1
openssl_openssl-namedisplay-options.1
openssl_openssl-passphrase-options.1
openssl_openssl-verification-options.1

Log Message:
avoid dup openssl


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/openssl/lib/libcrypto/man.inc
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-format-options.1 \

src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-namedisplay-options.1 
\

src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-passphrase-options.1 \

src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-verification-options.1
cvs rdiff -u -r1.1 -r0 \

src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-format-options.1
 \

src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-namedisplay-options.1
 \

src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-passphrase-options.1
 \

src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-verification-options.1

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/libcrypto

2023-05-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Wed May 10 02:23:56 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto: man.inc
src/crypto/external/bsd/openssl/lib/libcrypto/man: Makefile
Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/man:
openssl-format-options.1 openssl-namedisplay-options.1
openssl-passphrase-options.1 openssl-verification-options.1
Removed Files:
src/crypto/external/bsd/openssl/lib/libcrypto/man:
openssl_openssl-format-options.1
openssl_openssl-namedisplay-options.1
openssl_openssl-passphrase-options.1
openssl_openssl-verification-options.1

Log Message:
avoid dup openssl


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/openssl/lib/libcrypto/man.inc
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-format-options.1 \

src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-namedisplay-options.1 
\

src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-passphrase-options.1 \

src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-verification-options.1
cvs rdiff -u -r1.1 -r0 \

src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-format-options.1
 \

src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-namedisplay-options.1
 \

src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-passphrase-options.1
 \

src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl_openssl-verification-options.1

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/man.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/man.inc:1.15 src/crypto/external/bsd/openssl/lib/libcrypto/man.inc:1.16
--- src/crypto/external/bsd/openssl/lib/libcrypto/man.inc:1.15	Sun May  7 16:06:17 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/man.inc	Tue May  9 22:23:56 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: man.inc,v 1.15 2023/05/07 20:06:17 christos Exp $
+#	$NetBSD: man.inc,v 1.16 2023/05/10 02:23:56 christos Exp $
 
 .PATH:	${.CURDIR}/man
 
@@ -721,8 +721,12 @@ openssl-core.h.7 \
 openssl-core_dispatch.h.7 \
 openssl-core_names.h.7 \
 openssl-env.7 \
+openssl-format-options.1 \
 openssl-glossary.7 \
+openssl-namedisplay-options.1 \
+openssl-passphrase-options.1 \
 openssl-threads.7 \
+openssl-verification-options.1 \
 openssl.1 \
 openssl.cnf.5 \
 openssl_CA.pl.1 \
@@ -752,10 +756,6 @@ openssl_genrsa.1 \
 openssl_list.1 \
 openssl_nseq.1 \
 openssl_ocsp.1 \
-openssl_openssl-format-options.1 \
-openssl_openssl-namedisplay-options.1 \
-openssl_openssl-passphrase-options.1 \
-openssl_openssl-verification-options.1 \
 openssl_passwd.1 \
 openssl_pkcs12.1 \
 openssl_pkcs7.1 \

Index: src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile:1.7 src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile:1.8
--- src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile:1.7	Sun May  7 16:06:19 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/man/Makefile	Tue May  9 22:23:56 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2023/05/07 20:06:19 christos Exp $
+#	$NetBSD: Makefile,v 1.8 2023/05/10 02:23:56 christos Exp $
 
 # the makefile is not, and should not be visited during normal build process.
 # try to use latest pod2man, which comes with the latest perl.
@@ -20,7 +20,10 @@ make-manpages:
 		1) if [ "$$fn" = "openssl" ]; then \
 			dst=$$fn.$$sec; \
 		   else \
-			dst=openssl_$$fn.$$sec; \
+			case $$fn \
+			openssl*) dst=$$fn.$$sec;; \
+			*) dst=openssl_$$fn.$$sec;; \
+			eaac; \\
 		   fi;; \
 		*) dst=$$fn.$$sec;; \
 		esac; \

Added files:

Index: src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-format-options.1
diff -u /dev/null src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-format-options.1:1.1
--- /dev/null	Tue May  9 22:23:56 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/man/openssl-format-options.1	Tue May  9 22:23:56 2023
@@ -0,0 +1,269 @@
+.\"	$NetBSD: openssl-format-options.1,v 1.1 2023/05/10 02:23:56 christos Exp $
+.\"
+.\" Automatically generated by Pod::Man 4.14 (Pod::Simple 3.43)
+.\"
+.\" Standard preamble:
+.\" 
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will

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

2023-05-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May  9 19:22:07 UTC 2023

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

Log Message:
make things build again.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libdefault/Makefile
cvs rdiff -u -r1.12 -r1.13 \
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-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May  9 19:22:07 UTC 2023

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

Log Message:
make things build again.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libdefault/Makefile
cvs rdiff -u -r1.12 -r1.13 \
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.26 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.27
--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.26	Mon May  8 15:14:28 2023
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile	Tue May  9 15:22:07 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.26 2023/05/08 19:14:28 christos Exp $
+#	$NetBSD: Makefile,v 1.27 2023/05/09 19:22:07 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -45,6 +45,7 @@ CPPFLAGS+= -I${OPENSSLSRC}/crypto/modes
 CPPFLAGS+= -I${OPENSSLSRC}/../include
 
 
+
 CRYPTODIST=	${NETBSDSRCDIR}/crypto
 OPENSSLINC=	${OPENSSLSRC}/include/openssl
 
@@ -55,6 +56,8 @@ OPENSSLINC=	${OPENSSLSRC}/include/openss
 .include "srcs.inc"
 .include "${.CURDIR}/../libdefault/srcs.inc"
 CPPFLAGS+= -I${.CURDIR}/../libdefault
+CPPFLAGS+= -I${OPENSSLSRC}/providers/common/include
+CPPFLAGS+= -I${OPENSSLSRC}/providers/implementations/include
 .PATH: ${.CURDIR}/../libdefault
 .include "${.CURDIR}/../libcommon/srcs.inc"
 .PATH: ${.CURDIR}/../libcommon

Index: src/crypto/external/bsd/openssl/lib/libdefault/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.2 src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.3
--- src/crypto/external/bsd/openssl/lib/libdefault/Makefile:1.2	Mon May  8 10:30:33 2023
+++ src/crypto/external/bsd/openssl/lib/libdefault/Makefile	Tue May  9 15:22:07 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2023/05/08 14:30:33 christos Exp $
+#	$NetBSD: Makefile,v 1.3 2023/05/09 19:22:07 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -43,7 +43,8 @@ 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

Index: src/crypto/external/bsd/openssl/lib/libssl/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.12 src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.13
--- src/crypto/external/bsd/openssl/lib/libssl/Makefile:1.12	Sun May  7 15:13:15 2023
+++ src/crypto/external/bsd/openssl/lib/libssl/Makefile	Tue May  9 15:22:07 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2023/05/07 19:13:15 christos Exp $
+#	$NetBSD: Makefile,v 1.13 2023/05/09 19:22:07 christos Exp $
 
 # RCSid:
 #	Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -36,6 +36,8 @@ CRYPTODIST=	${NETBSDSRCDIR}/crypto
 .PATH: ${OPENSSLSRC} ${OPENSSLSRC}/crypto/pqueue ${OPENSSLSRC}/include/openssl
 
 .include "srcs.inc"
+.PATH: ${OPENSSLSRC}/crypto
+SRCS+= packet.c
 
 LIBDPLIBS+=crypto ${.CURDIR}/../libcrypto
 
@@ -51,6 +53,7 @@ PKGCONFIG=libssl openssl
 .include "${.CURDIR}/../../pkgconfig.mk"
 
 
+
 GENH = \
 ssl.h
 



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

2023-05-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May  9 17:22:44 UTC 2023

Added Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64:
aes-gcm-armv8_64.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm:
aes-gcm-armv8_64.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc:
ecp_nistp521-ppc64.S ppc64-mont-fixed.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64:
ecp_nistp521-ppc64.S ppc64-mont-fixed.S

Log Message:
Add new files


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aes-gcm-armv8_64.S
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-gcm-armv8_64.S
cvs rdiff -u -r0 -r1.1 \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ecp_nistp521-ppc64.S 
\

src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppc64-mont-fixed.S
cvs rdiff -u -r0 -r1.1 \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ecp_nistp521-ppc64.S
 \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64/ppc64-mont-fixed.S

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/libcrypto/arch

2023-05-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May  9 17:21:17 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64:
aesv8-armx.S arm64cpuid.S armv8-mont.S chacha-armv8.S
ecp_nistz256-armv8.S ghashv8-armx.S keccak1600-armv8.S
poly1305-armv8.S sha1-armv8.S sha512-armv8.S vpaes-armv8.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: aes-armv4.S
aesv8-armx.S arm64cpuid.S armv4-gf2m.S armv4-mont.S armv4cpuid.S
armv8-mont.S bsaes-armv7.S chacha-armv4.S chacha-armv8.S
ecp_nistz256-armv4.S ecp_nistz256-armv8.S ghash-armv4.S
ghashv8-armx.S keccak1600-armv4.S keccak1600-armv8.S
poly1305-armv4.S poly1305-armv8.S sha1-armv4-large.S sha1-armv8.S
sha256-armv4.S sha512-armv4.S sha512-armv8.S vpaes-armv8.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/i386: aesni-x86.S
bf-586.S bn-586.S cast-586.S chacha-x86.S cmll-x86.S co-586.S
crypt586.S des-586.S e_padlock-x86.S ecp_nistz256-x86.S ghash-x86.S
md5-586.S poly1305-x86.S rc4-586.S rc5-586.S rmd-586.S sha1-586.S
sha256-586.S sha512-586.S uplink-x86.S vpaes-x86.S x86cpuid.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/mips: aes-mips.S
aes-mips64.S mips.S mips64.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: Makefile
poly1305-ppc.S sha512-ppc.S sha512p8-ppc.S vpaes-ppc.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc64:
keccak1600-ppc64.S poly1305-ppc.S sha512-ppc.S sha512p8-ppc.S
vpaes-ppc.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc: aes-sparcv9.S
aesfx-sparcv9.S aest4-sparcv9.S bn-sparcv8.S cmllt4-sparcv9.S
des_enc-sparc.S dest4-sparcv9.S ecp_nistz256-sparcv9.S
ghash-sparcv9.S md5-sparcv9.S poly1305-sparcv9.S sha1-sparcv9.S
sha512-sparcv9.S sparct4-mont.S sparcv9-gf2m.S sparcv9-mont.S
sparcv9a-mont.S vis3-mont.S
src/crypto/external/bsd/openssl/lib/libcrypto/arch/sparc64:
aes-sparcv9.S aesfx-sparcv9.S aest4-sparcv9.S cmllt4-sparcv9.S
des_enc-sparc.S dest4-sparcv9.S ecp_nistz256-sparcv9.S
ghash-sparcv9.S md5-sparcv9.S poly1305-sparcv9.S sha1-sparcv9.S
sha512-sparcv9.S sparct4-mont.S sparcv9-gf2m.S sparcv9-mont.S
sparcv9a-mont.S vis3-mont.S

Log Message:
Regen


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/aesv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/chacha-armv8.S \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ecp_nistz256-armv8.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/ghashv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/poly1305-armv8.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/sha1-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/vpaes-armv8.S
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/arm64cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/armv8-mont.S \

src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/keccak1600-armv8.S
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/aarch64/sha512-armv8.S
cvs rdiff -u -r1.6 -r1.7 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S
cvs rdiff -u -r1.5 -r1.6 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S 
\
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv8.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv4.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv8.S
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S \

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

2023-05-09 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Tue May  9 16:41:29 UTC 2023

Modified Files:
src/crypto/external/bsd/openssl/include/openssl: configuration.h

Log Message:
fix 32 bit builds


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/include/openssl/configuration.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/include/openssl/configuration.h
diff -u src/crypto/external/bsd/openssl/include/openssl/configuration.h:1.1 src/crypto/external/bsd/openssl/include/openssl/configuration.h:1.2
--- src/crypto/external/bsd/openssl/include/openssl/configuration.h:1.1	Sun May  7 14:41:35 2023
+++ src/crypto/external/bsd/openssl/include/openssl/configuration.h	Tue May  9 12:41:29 2023
@@ -117,9 +117,14 @@ extern "C" {
 # if !defined(OPENSSL_SYS_UEFI)
 #  undef BN_LLONG
 /* Only one for the following should be defined */
-#  define SIXTY_FOUR_BIT_LONG
 #  undef SIXTY_FOUR_BIT
-#  undef THIRTY_TWO_BIT
+#  ifdef __LP64__
+#   define SIXTY_FOUR_BIT_LONG
+#   undef THIRTY_TWO_BIT
+#  else
+#   undef SIXTY_FOUR_BIT_LONG
+#   define THIRTY_TWO_BIT
+#  endif
 # endif
 
 # define RC4_INT unsigned int



  1   2   >