===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/ssh-rsa.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- src/usr.bin/ssh/ssh-rsa.c	2018/02/07 05:17:56	1.65
+++ src/usr.bin/ssh/ssh-rsa.c	2018/02/14 16:27:24	1.66
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-rsa.c,v 1.65 2018/02/07 05:17:56 jsing Exp $ */
+/* $OpenBSD: ssh-rsa.c,v 1.66 2018/02/14 16:27:24 jsing Exp $ */
 /*
  * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org>
  *
@@ -74,13 +74,12 @@
 	}
 }
 
-/* calculate p-1 and q-1 */
 int
 ssh_rsa_generate_additional_parameters(struct sshkey *key)
 {
-	RSA *rsa;
 	BIGNUM *aux = NULL;
 	BN_CTX *ctx = NULL;
+	BIGNUM d;
 	int r;
 
 	if (key == NULL || key->rsa == NULL ||
@@ -93,12 +92,15 @@
 		r = SSH_ERR_ALLOC_FAIL;
 		goto out;
 	}
-	rsa = key->rsa;
+	BN_set_flags(aux, BN_FLG_CONSTTIME);
 
-	if ((BN_sub(aux, rsa->q, BN_value_one()) == 0) ||
-	    (BN_mod(rsa->dmq1, rsa->d, aux, ctx) == 0) ||
-	    (BN_sub(aux, rsa->p, BN_value_one()) == 0) ||
-	    (BN_mod(rsa->dmp1, rsa->d, aux, ctx) == 0)) {
+	BN_init(&d);
+	BN_with_flags(&d, key->rsa->d, BN_FLG_CONSTTIME);
+
+	if ((BN_sub(aux, key->rsa->q, BN_value_one()) == 0) ||
+	    (BN_mod(key->rsa->dmq1, &d, aux, ctx) == 0) ||
+	    (BN_sub(aux, key->rsa->p, BN_value_one()) == 0) ||
+	    (BN_mod(key->rsa->dmp1, &d, aux, ctx) == 0)) {
 		r = SSH_ERR_LIBCRYPTO_ERROR;
 		goto out;
 	}