INN commit: trunk/nnrpd (tls.c)

[INN Commit]

    Date: Tuesday, September 17, 2019 @ 12:00:22
  Author: iulius
Revision: 10347

nnrpd:  fix the selection of DH parameters

When the parameters have already been initialized, the callback returns NULL
instead of the previously loaded buffer.

Fix to previous commit 10343.

Thanks to Adam D. Barratt for having caught the issue.

Modified:
  trunk/nnrpd/tls.c

-------+
 tls.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: tls.c
===================================================================
--- tls.c	2019-09-04 17:48:24 UTC (rev 10346)
+++ tls.c	2019-09-17 19:00:22 UTC (rev 10347)
@@ -213,8 +213,8 @@
             if (ffdhe2048 == NULL) {
                 ffdhe2048 = load_dh_buffer(file_ffdhe2048,
                                            sizeof(file_ffdhe2048));
-                r = ffdhe2048;
             }
+            r = ffdhe2048;
             break;
 
         case 3: /* DH keys shorter than 3072 bits are prohibited. */
@@ -221,8 +221,8 @@
             if (ffdhe4096 == NULL) {
                 ffdhe4096 = load_dh_buffer(file_ffdhe4096,
                                            sizeof(file_ffdhe4096));
-                r = ffdhe4096;
             }
+            r = ffdhe4096;
             break;
 
         case 4: /* DH keys shorter than 7680 bits are prohibited. */
@@ -230,8 +230,8 @@
             if (ffdhe8192 == NULL) {
                 ffdhe8192 = load_dh_buffer(file_ffdhe8192,
                                            sizeof(file_ffdhe8192));
-                r = ffdhe8192;
             }
+            r = ffdhe8192;
     }
 
     return r;