fix comp. warnings

tgauth · tgauth · commit 623e4dabf697 · 2025-09-10T15:56:28.000-04:00
diff --git a/contrib/win32/win32compat/signal_sigalrm.c b/contrib/win32/win32compat/signal_sigalrm.c
@@ -45,7 +45,7 @@ sigalrm_APC(_In_opt_ LPVOID lpArgToCompletionRoutine,
 }
 
 unsigned int
-w32_alarm(unsigned int sec)
+w32_alarm(long long sec)
 {
 	LARGE_INTEGER due;
 	ULONGLONG sec_passed;
diff --git a/ssh-pkcs11-client.c b/ssh-pkcs11-client.c
@@ -593,15 +593,31 @@ ecdsa_do_finish(EC_KEY *ec)
 #ifdef WINDOWS
 
 static void
-wrap_key(struct sshkey *k)
+wrap_key(struct sshkey* k)
 {
-	if (k->type == KEY_RSA)
-		RSA_set_method(k->pkey, helper_rsa);
+	RSA* rsa = NULL;
+	EC_KEY* ecdsa = NULL;
+
+	if (k->type == KEY_RSA) {
+		if ((rsa = EVP_PKEY_get1_RSA(k->pkey)) == NULL)
+			fatal_f("no RSA key");
+		if (RSA_set_method(rsa, helper_rsa) != 1)
+			fatal_f("RSA_set_method failed");
+		if (EVP_PKEY_set1_RSA(k->pkey, rsa) != 1)
+			fatal_f("EVP_PKEY_set1_RSA failed");
+		RSA_free(rsa);
 #if defined(OPENSSL_HAS_ECC) && defined(HAVE_EC_KEY_METHOD_NEW)
-	else if (k->type == KEY_ECDSA)
-		EC_KEY_set_method(k->pkey, helper_ecdsa);
+	}
+	else if (k->type == KEY_ECDSA) {
+		if ((ecdsa = EVP_PKEY_get1_EC_KEY(k->pkey)) == NULL)
+			fatal_f("no ECDSA key");
+		if (EC_KEY_set_method(ecdsa, helper_ecdsa) != 1)
+			fatal_f("EC_KEY_set_method failed");
+		if (EVP_PKEY_set1_EC_KEY(k->pkey, ecdsa) != 1)
+			fatal_f("EVP_PKEY_set1_EC_KEY failed");
+		EC_KEY_free(ecdsa);
 #endif /* OPENSSL_HAS_ECC && HAVE_EC_KEY_METHOD_NEW */
-	else
+	} else
 		fatal_f("unknown key type");
 }
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ sigalrm_APC(_In_opt_ LPVOID lpArgToCompletionRoutine,`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`unsigned int`
`48`		`-w32_alarm(unsigned int sec)`
	`48`	`+w32_alarm(long long sec)`
`49`	`49`	`{`
`50`	`50`	`LARGE_INTEGER due;`
`51`	`51`	`ULONGLONG sec_passed;`