Changeset 578:7c9a00bfd115 in freeDiameter for freeDiameter/fdd.y

Timestamp:

Oct 27, 2010, 10:52:30 AM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Allow TLS Diffie-Hellmann parameters to be loaded from a file (ticket #17)

File:

• freeDiameter/fdd.y (modified) (2 diffs)

freeDiameter/fdd.y

@@ -118 +118 @@
 %token          TLS_PRIO
 %token          TLS_DH_BITS
+%token          TLS_DH_FILE
 
 
@@ -582 +583 @@
                         {
                                 conf->cnf_sec_data.dh_bits = $3;
-                                TRACE_DEBUG(FULL, "Generating DH parameters...");
-                                CHECK_GNUTLS_DO( gnutls_dh_params_generate2( 
-                                                        conf->cnf_sec_data.dh_cache,
-                                                        conf->cnf_sec_data.dh_bits),
-                                                { yyerror (&yylloc, conf, "Error setting DH Bits parameters."); 
-                                                 YYERROR; } );
-                                TRACE_DEBUG(FULL, "DH parameters generated.");
-                        }
-                        ;
+                        }
+                        | TLS_DH_FILE '=' QSTRING ';'
+                        {
+                                FILE * fd;
+                                free(conf->cnf_sec_data.dh_file);
+                                conf->cnf_sec_data.dh_file = $3;
+                                fd = fopen($3, "r");
+                                if (fd == NULL) {
+                                        int ret = errno;
+                                        TRACE_DEBUG(INFO, "Unable to open DH file %s for reading: %s\n", $3, strerror(ret));
+                                        yyerror (&yylloc, conf, "Error on file name"); 
+                                        YYERROR;
+                                }
+                                fclose(fd);
+                        }
+                        ;