From 1d0cbc3265870a57687e38c898c867d871d4dc5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Sat, 24 Nov 2018 11:27:39 +0100
Subject: [PATCH] ChangeLog entries, minor comment and spacing fixes

---
 ChangeLog     | 11 +++++++++++
 rsa-sign-tr.c |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b79cf26c..f938b2cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2018-11-08  Simo Sorce	  <simo@redhat.com>
 
+	* rsa-sign-tr.c (rsa_sec_compute_root_tr): New function that uses
+	_rsa_sec_compute_root, as well as side-channel silent RSA
+	blinding.
+	(rsa_compute_root_tr) Rewritten as a wrapper around
+	rsa_sec_compute_root_tr.
+	(rsa_sec_blind, rsa_sec_unblind, sec_equal, rsa_sec_check_root)
+	(cnd_mpn_zero): New helper functions.
+	(rsa_sec_compute_root_tr) [NETTLE_USE_MINI_GMP]: Defined as a not
+	side-channel silent wrapper around rsa_compute_root_tr, and the
+	latter function left unchanged.
+
 	* rsa-sec-compute-root.c (_rsa_sec_compute_root_itch)
 	(_rsa_sec_compute_root): New file, new private functions.
 	Side-channel silent version of rsa_compute_root.
diff --git a/rsa-sign-tr.c b/rsa-sign-tr.c
index a51e3ea4..524abb5a 100644
--- a/rsa-sign-tr.c
+++ b/rsa-sign-tr.c
@@ -4,6 +4,7 @@
 
    Copyright (C) 2001, 2015 Niels Möller
    Copyright (C) 2012 Nikos Mavrogiannopoulos
+   Copyright (C) 2018 Red Hat Inc.
 
    This file is part of GNU Nettle.
 
@@ -145,7 +146,7 @@ rsa_sec_compute_root_tr(const struct rsa_public_key *pub,
   res = rsa_compute_root_tr(pub, key, random_ctx, random, xz, mz);
 
   if (res)
-      mpz_limbs_copy(x, xz, mpz_size(pub->n));
+    mpz_limbs_copy(x, xz, mpz_size(pub->n));
 
   mpz_clear(mz);
   mpz_clear(xz);
-- 
GitLab