1) updated version string to new format.

2) macos with pam was failing CI tests because it
   explicitly needs a module named hpnsshd. I think
   I modifed setup-ci.sh to handle that.

Author: rapier1

.github/setup_ci.sh

@@ -26,6 +26,7 @@ esac
 TARGETS=$@
 
 INSTALL_FIDO_PPA="no"
+COPY_PAM_MODULE="no"
 export DEBIAN_FRONTEND=noninteractive
 
 #echo "Setting up for '$TARGETS'"
@@ -85,6 +86,7 @@ for TARGET in $TARGETS; do
 	esac
         ;;
     *pam)
+	COPY_PAM_MODULE="yes"
         PACKAGES="$PACKAGES libpam0g-dev"
         ;;
     sk)
@@ -139,6 +141,14 @@ if [ "yes" = "$INSTALL_FIDO_PPA" ]; then
     sudo apt-add-repository -y ppa:yubico/stable
 fi
 
+#need to copy the pam modules for sshd to hpnsshd on
+#macos with pam.
+if [ "yes" = "$COPY_PAM_MODULE" ]; then
+    if [ `uname` = "Darwin" }; then
+	sudo cp /etc/pam.d/sshd /etc/pam.d/hpnsshd
+    fi
+fi
+
 tries=3
 while [ ! -z "$PACKAGES" ] && [ "$tries" -gt "0" ]; do
     case "$PACKAGER" in

cipher-chachapoly-libcrypto-mt.c

@@ -318,7 +318,6 @@ chachapoly_free_mt(struct chachapoly_ctx_mt * ctx_mt)
 
 		/* Join advancement thread if it exists */
 		if (ctx_mt->adv_tid != ctx_mt->self_tid) {
-			debug_f("Killed advancement thread");
 			pthread_join(ctx_mt->adv_tid, NULL);
 			ctx_mt->adv_tid = ctx_mt->self_tid;
 		}

version.h

@@ -3,5 +3,5 @@
 #define SSH_VERSION	"OpenSSH_9.3"
 
 #define SSH_PORTABLE	"p1"
-#define SSH_HPN         "-hpn18v1RC1"
+#define SSH_HPN         "-hpn18.1.0-RC1"
 #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE SSH_HPN