From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 31 May 2009 17:36:18 +0000 (-0400)
Subject: Fix-ups for dynamic OpenSSL engine patch.
X-Git-Tag: tor-0.2.2.1-alpha~102^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ca10bb62faaed6a5242ff760ed6c76330a750ef;p=thirdparty%2Ftor.git

Fix-ups for dynamic OpenSSL engine patch.

Include a changelog, and don't try to compare strings with !=.
---

diff --git a/ChangeLog b/ChangeLog
index ee9f814f5a..ff01403b78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Changes in version 0.2.2.1-alpha - 2009-??-??
-  o Minor features
+  o Major features:
+    - Add support for dynamic OpenSSL hardware crypto acceleration engines
+      via new AccelName and AccelDir options.
+
+  o Minor features:
     - New --digests command-line switch to output the digests of the
       source files Tor was built with.
     - The "torify" script now uses torsocks where available.
diff --git a/src/or/config.c b/src/or/config.c
index 0d176670e4..dea76391d1 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3671,8 +3671,8 @@ options_transition_allowed(or_options_t *old, or_options_t *new_val,
   }
 
   if ((old->HardwareAccel != new_val->HardwareAccel)
-      || (old->AccelName != new_val->AccelName)
-      || (old->AccelDir != new_val->AccelDir)) {
+      || !opt_streq(old->AccelName, new_val->AccelName)
+      || !opt_streq(old->AccelDir, new_val->AccelDir)) {
     *msg = tor_strdup("While Tor is running, changing OpenSSL hardware "
                       "acceleration engine is not allowed.");
     return -1;