1 files changed, 9 insertions, 4 deletions

diff --git a/src/lib/libcrypto/conf/conf_def.c b/src/lib/libcrypto/conf/conf_def.c
index b5a876ae68..2464f8ed90 100644
--- a/src/lib/libcrypto/conf/conf_def.c
+++ b/src/lib/libcrypto/conf/conf_def.c
@@ -613,13 +613,13 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
                                 e++;
                                 }
                         /* So at this point we have
-                         * ns which is the start of the name string which is
+                         * np which is the start of the name string which is
                          *   '\0' terminated. 
-                         * cs which is the start of the section string which is
+                         * cp which is the start of the section string which is
                          *   '\0' terminated.
                          * e is the 'next point after'.
-                         * r and s are the chars replaced by the '\0'
-                         * rp and sp is where 'r' and 's' came from.
+                         * r and rr are the chars replaced by the '\0'
+                         * rp and rrp is where 'r' and 'rr' came from.
                          */
                         p=_CONF_get_string(conf,cp,np);
                         if (rrp != NULL) *rrp=rr;
@@ -638,6 +638,11 @@ static int str_copy(CONF *conf, char *section, char **pto, char *from)
                            points at.  /RL */
                         len -= e-from;
                         from=e;
+
+                        /* In case there were no braces or parenthesis around
+                           the variable reference, we have to put back the
+                           character that was replaced with a '\0'.  /RL */
+                        *rp = r;
                         }
                 else
                         buf->data[to++]= *(from++);