4 files changed, 18 insertions, 11 deletions

diff --git a/src/lib/libcrypto/des/des_key.c b/src/lib/libcrypto/des/des_key.c
index eee8a7e127..62d6a8bb19 100644
--- a/src/lib/libcrypto/des/des_key.c
+++ b/src/lib/libcrypto/des/des_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: des_key.c,v 1.1 2024/08/31 15:56:09 jsing Exp $ */
+/* $OpenBSD: des_key.c,v 1.2 2025/10/27 16:57:37 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -107,7 +107,7 @@ DES_check_key_parity(const_DES_cblock *key)
 }
 LCRYPTO_ALIAS(DES_check_key_parity);
 
-/* Weak and semi weak keys as taken from
+/* Weak and semi-weak keys as taken from
  * %A D.W. Davies
  * %A W.L. Price
  * %T Security for Computer Networks
diff --git a/src/lib/libssl/man/SSL_SESSION_new.3 b/src/lib/libssl/man/SSL_SESSION_new.3
index 1557eafb78..182266a311 100644
--- a/src/lib/libssl/man/SSL_SESSION_new.3
+++ b/src/lib/libssl/man/SSL_SESSION_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: SSL_SESSION_new.3,v 1.11 2025/10/24 11:36:54 tb Exp $
+.\" $OpenBSD: SSL_SESSION_new.3,v 1.12 2025/10/24 13:18:22 tb Exp $
 .\"
 .\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -18,7 +18,8 @@
 .Dt SSL_SESSION_NEW 3
 .Os
 .Sh NAME
-.Nm SSL_SESSION_new
+.Nm SSL_SESSION_new ,
+.Nm SSL_SESSION_dup
 .Nd construct a new SSL_SESSION object
 .Sh SYNOPSIS
 .Lb libssl libcrypto
diff --git a/src/lib/libssl/tls13_server.c b/src/lib/libssl/tls13_server.c
index f852e08a52..fa56db9563 100644
--- a/src/lib/libssl/tls13_server.c
+++ b/src/lib/libssl/tls13_server.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls13_server.c,v 1.110 2025/10/16 14:42:21 jsing Exp $ */
+/* $OpenBSD: tls13_server.c,v 1.111 2025/10/25 12:31:44 tb Exp $ */
 /*
  * Copyright (c) 2019, 2020 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2020 Bob Beck <beck@openbsd.org>
@@ -327,7 +327,7 @@ tls13_client_hello_recv(struct tls13_ctx *ctx, CBS *cbs)
 }
 
 static int
-tls13_server_hello_build(struct tls13_ctx *ctx, CBB *cbb, int hrr)
+tls13_server_hello_build(struct tls13_ctx *ctx, CBB *cbb)
 {
         uint16_t tlsext_msg_type = SSL_TLSEXT_MSG_SH;
         const uint8_t *server_random;
@@ -338,7 +338,7 @@ tls13_server_hello_build(struct tls13_ctx *ctx, CBB *cbb, int hrr)
         cipher = SSL_CIPHER_get_value(ctx->hs->cipher);
         server_random = s->s3->server_random;
 
-        if (hrr) {
+        if (ctx->hs->tls13.hrr) {
                 server_random = tls13_hello_retry_request_hash;
                 tlsext_msg_type = SSL_TLSEXT_MSG_HRR;
         }
@@ -447,7 +447,7 @@ tls13_server_hello_retry_request_send(struct tls13_ctx *ctx, CBB *cbb)
         if (ctx->hs->tls13.server_group == 0)
                 return 0;
 
-        if (!tls13_server_hello_build(ctx, cbb, 1))
+        if (!tls13_server_hello_build(ctx, cbb))
                 return 0;
 
         return 1;
@@ -507,7 +507,7 @@ tls13_server_hello_send(struct tls13_ctx *ctx, CBB *cbb)
         if (!tls13_servername_process(ctx))
                 return 0;
 
-        if (!tls13_server_hello_build(ctx, cbb, 0))
+        if (!tls13_server_hello_build(ctx, cbb))
                 return 0;
 
         return 1;
diff --git a/src/regress/lib/libc/malloc/malloc_general/malloc_general.c b/src/regress/lib/libc/malloc/malloc_general/malloc_general.c
index b243787bcf..b0387ce64e 100644
--- a/src/regress/lib/libc/malloc/malloc_general/malloc_general.c
+++ b/src/regress/lib/libc/malloc/malloc_general/malloc_general.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: malloc_general.c,v 1.7 2022/01/09 07:18:50 otto Exp $ */
+/*      $OpenBSD: malloc_general.c,v 1.8 2025/10/26 21:25:12 miod Exp $ */
 /*
  * Copyright (c) 2017 Otto Moerbeek <otto@drijf.net>
  *
@@ -24,6 +24,12 @@
 
 #define N 1000
 
+#if defined(_LP64)
+#define COUNT 800000
+#else
+#define COUNT 20000
+#endif
+
 size_t
 size(void)
 {
@@ -59,7 +65,7 @@ main(int argc, char *argv[])
         void * q;
         size_t sz;
 
-        for (count = 0; count < 800000; count++) {
+        for (count = 0; count < COUNT; count++) {
                 if (count % 10000 == 0) {
                         printf(".");
                         fflush(stdout);