From 2acd81bd7a1b364b02831ae5f8e46457d9d07865 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Fri, 21 Sep 2012 15:07:11 +0200
Subject: Nicely encapsulate different crypto algorithm implementations

---
 src/config.y | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/config.y')

diff --git a/src/config.y b/src/config.y
index 8fea5a3..2b1af0f 100644
--- a/src/config.y
+++ b/src/config.y
@@ -95,7 +95,7 @@
 %token TOK_NO
 %token TOK_PORT
 %token TOK_FLOAT
-%token TOK_ALGORITHM
+%token TOK_CRYPTO
 %token TOK_USE
 
 %token <addr> TOK_ADDR
@@ -103,7 +103,6 @@
 
 
 %code {
-	#include <config.h>
 	#include <peer.h>
 
 	#include <stdint.h>
@@ -138,7 +137,7 @@ statement:	TOK_LOG log ';'
 	|	TOK_MODE mode ';'
 	|	TOK_PROTOCOL protocol ';'
 	|	TOK_METHOD method ';'
-	|	TOK_ALGORITHM algorithm ';'
+	|	TOK_CRYPTO crypto ';'
 	|	TOK_SECRET secret ';'
 	|	TOK_ON TOK_UP on_up ';'
 	|	TOK_ON TOK_DOWN on_down ';'
@@ -229,9 +228,9 @@ method:		TOK_STRING {
 		}
 	;
 
-algorithm:	TOK_STRING TOK_USE TOK_STRING {
-			if (!fastd_config_algorithm(ctx, conf, $1->str, $3->str)) {
-				fastd_config_error(&@$, ctx, conf, filename, depth, "invalid algorithm/implementation");
+crypto:	TOK_STRING TOK_USE TOK_STRING {
+			if (!fastd_config_crypto(ctx, conf, $1->str, $3->str)) {
+				fastd_config_error(&@$, ctx, conf, filename, depth, "invalid crypto algorithm/implementation");
 				YYERROR;
 			}
 		}
-- 
cgit v1.2.3