aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2001-05-02 07:15:03 +0000
committerRichard Levitte <levitte@openssl.org>2001-05-02 07:15:03 +0000
commitd02408ad8a2c277feee1d43d34b8d140abc71263 (patch)
treec7d549aca9c8b497eb3bbd5a4e5290bc68e70b7d
parent7ae551fd03b447e41d3a74e803a711350383ebc4 (diff)
downloadopenssl-d02408ad8a2c277feee1d43d34b8d140abc71263.tar.gz
Remove part conflict indicator...
-rw-r--r--CHANGES1
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 15a9c155fc..10d4a47d2e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -114,7 +114,6 @@
that they do not hold after the first thread unsets add_do_not_lock).
[Bodo Moeller]
->>>>>>> 1.823
+) Implement binary inversion algorithm for BN_mod_inverse in addition
to the algorithm using long divison. The binary algorithm can be
used only if the modulus is odd. On 32-bit systems, it is faster