) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-DROP TABLE IF EXISTS `algorithms`;
-CREATE TABLE `algorithms` (
+DROP TABLE IF EXISTS `proposals`;
+CREATE TABLE `proposals` (
`id` int(10) unsigned NOT NULL auto_increment,
- `algorithm` varchar(128) NOT NULL
+ `proposal` varchar(128) NOT NULL
);
-DROP TABLE IF EXISTS `child_config_algorithm`;
-CREATE TABLE `child_config_algorithm` (
+DROP TABLE IF EXISTS `child_config_proposal`;
+CREATE TABLE `child_config_proposal` (
`child_cfg` int(10) unsigned NOT NULL,
`prio` smallint(5) unsigned NOT NULL,
- `alg` int(10) unsigned NOT NULL
+ `prop` int(10) unsigned NOT NULL
);
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-DROP TABLE IF EXISTS `ike_config_algorithm`;
-CREATE TABLE `ike_config_algorithm` (
+DROP TABLE IF EXISTS `ike_config_proposal`;
+CREATE TABLE `ike_config_proposal` (
`ike_cfg` int(10) unsigned NOT NULL,
`prio` smallint(5) unsigned NOT NULL,
- `alg` int(10) unsigned NOT NULL
+ `prop` int(10) unsigned NOT NULL
);
/*
* Copyright (C) 2006-2008 Martin Willi
+ * Copyright (C) 2010 Andreas Steffen
* Hochschule fuer Technik Rapperswil
*
* This program is free software; you can redistribute it and/or modify it
{
enumerator_t *e;
proposal_t *proposal;
- char *alg;
+ char *prop;
bool use_default = TRUE;
e = this->db->query(this->db,
- "SELECT algorithm "
- "FROM algorithms JOIN child_config_algorithm ON id = alg "
+ "SELECT proposal "
+ "FROM proposals JOIN child_config_proposal ON id = prop "
"WHERE child_cfg = ? ORDER BY prio",
DB_INT, id, DB_TEXT);
if (e)
{
- while (e->enumerate(e, &alg))
+ while (e->enumerate(e, &prop))
{
- proposal = proposal_create_from_string(PROTO_ESP, alg);
+ proposal = proposal_create_from_string(PROTO_ESP, prop);
child->add_proposal(child, proposal);
use_default = FALSE;
}
{
enumerator_t *e;
proposal_t *proposal;
- char *alg;
+ char *prop;
bool use_default = TRUE;
e = this->db->query(this->db,
- "SELECT algorithm "
- "FROM algorithms JOIN ike_config_algorithm ON id = alg "
+ "SELECT proposal "
+ "FROM proposals JOIN ike_config_proposal ON id = prop "
"WHERE ike_cfg = ? ORDER BY prio",
DB_INT, id, DB_TEXT);
if (e)
{
- while (e->enumerate(e, &alg))
+ while (e->enumerate(e, &prop))
{
- proposal = proposal_create_from_string(PROTO_IKE, alg);
+ proposal = proposal_create_from_string(PROTO_IKE, prop);
ike_cfg->add_proposal(ike_cfg, proposal);
use_default = FALSE;
}
child_cfg, traffic_selector
);
-DROP TABLE IF EXISTS algorithms;
-CREATE TABLE algorithms (
+DROP TABLE IF EXISTS proposals;
+CREATE TABLE proposals (
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- algorithm TEXT NOT NULL
+ proposal TEXT NOT NULL
);
-DROP TABLE IF EXISTS child_config_algorithm;
-CREATE TABLE child_config_algorithm (
+DROP TABLE IF EXISTS child_config_proposal;
+CREATE TABLE child_config_proposal (
child_cfg INTEGER NOT NULL,
prio INTEGER NOT NULL,
- alg INTEGER NOT NULL
+ prop INTEGER NOT NULL
);
);
-DROP TABLE IF EXISTS ike_config_algorithm;
-CREATE TABLE ike_config_algorithm (
+DROP TABLE IF EXISTS ike_config_proposal;
+CREATE TABLE ike_config_proposal (
ike_cfg INTEGER NOT NULL,
prio INTEGER NOT NULL,
- alg INTEGER NOT NULL
+ prop INTEGER NOT NULL
);
child_cfg, traffic_selector
);
-DROP TABLE IF EXISTS algorithms;
-CREATE TABLE algorithms (
+DROP TABLE IF EXISTS proposals;
+CREATE TABLE proposals (
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
- algorithm TEXT NOT NULL
+ proposal TEXT NOT NULL
);
-DROP TABLE IF EXISTS child_config_algorithm;
-CREATE TABLE child_config_algorithm (
+DROP TABLE IF EXISTS child_config_proposal;
+CREATE TABLE child_config_proposal (
child_cfg INTEGER NOT NULL,
prio INTEGER NOT NULL,
- alg INTEGER NOT NULL
+ prop INTEGER NOT NULL
);
DROP TABLE IF EXISTS ike_configs;
remote TEXT NOT NULL
);
-DROP TABLE IF EXISTS ike_config_algorithm;
-CREATE TABLE ike_config_algorithm (
+DROP TABLE IF EXISTS ike_config_proposal;
+CREATE TABLE ike_config_proposal (
ike_cfg INTEGER NOT NULL,
prio INTEGER NOT NULL,
- alg INTEGER NOT NULL
+ prop INTEGER NOT NULL
);
DROP TABLE IF EXISTS peer_configs;
1, 6
);
-/* Algorithms */
+/* Proposals */
-INSERT INTO algorithms (
- algorithm
+INSERT INTO proposals (
+ proposal
) VALUES (
'aes128-sha256-modp3072'
);
'PH_IP_MOON', 'PH_IP_SUN'
);
-INSERT INTO ike_config_algorithm (
- ike_cfg, prio, alg
+INSERT INTO ike_config_proposal (
+ ike_cfg, prio, prop
) VALUES (
1, 1, 1
);
1, 3
);
-INSERT INTO child_config_algorithm (
- child_cfg, prio, alg
+INSERT INTO child_config_proposal (
+ child_cfg, prio, prop
) VALUES (
1, 1, 1
);
-INSERT INTO child_config_algorithm (
- child_cfg, prio, alg
+INSERT INTO child_config_proposal (
+ child_cfg, prio, prop
) VALUES (
2, 1, 1
);
-INSERT INTO child_config_algorithm (
- child_cfg, prio, alg
+INSERT INTO child_config_proposal (
+ child_cfg, prio, prop
) VALUES (
3, 1, 1
);
1, 6
);
-/* Algorithms */
+/* Proposals */
-INSERT INTO algorithms (
- algorithm
+INSERT INTO proposals (
+ proposal
) VALUES (
'aes128-sha256-modp3072'
);
'PH_IP_SUN', 'PH_IP_MOON'
);
-INSERT INTO ike_config_algorithm (
- ike_cfg, prio, alg
+INSERT INTO ike_config_proposal (
+ ike_cfg, prio, prop
) VALUES (
1, 1, 1
);
1, 3
);
-INSERT INTO child_config_algorithm (
- child_cfg, prio, alg
+INSERT INTO child_config_proposal (
+ child_cfg, prio, prop
) VALUES (
1, 1, 1
);
-INSERT INTO child_config_algorithm (
- child_cfg, prio, alg
+INSERT INTO child_config_proposal (
+ child_cfg, prio, prop
) VALUES (
2, 1, 1
);
-INSERT INTO child_config_algorithm (
- child_cfg, prio, alg
+INSERT INTO child_config_proposal (
+ child_cfg, prio, prop
) VALUES (
3, 1, 1
);
1, 6
);
-/* Algorithms */
+/* Proposals */
-INSERT INTO algorithms (
- algorithm
+INSERT INTO proposals (
+ proposal
) VALUES (
'aes128-sha256-modp2048'
);
-INSERT INTO algorithms (
- algorithm
+INSERT INTO proposals (
+ proposal
) VALUES (
'aes192-sha384-modp3072'
);
-INSERT INTO algorithms (
- algorithm
+INSERT INTO proposals (
+ proposal
) VALUES (
'aes128gcm128'
);
-INSERT INTO algorithms (
- algorithm
+INSERT INTO proposals (
+ proposal
) VALUES (
'aes192gcm128'
);
'PH_IP_MOON', 'PH_IP_SUN'
);
-INSERT INTO ike_config_algorithm (
- ike_cfg, prio, alg
+INSERT INTO ike_config_proposal (
+ ike_cfg, prio, prop
) VALUES (
1, 1, 1
);
-INSERT INTO ike_config_algorithm (
- ike_cfg, prio, alg
+INSERT INTO ike_config_proposal (
+ ike_cfg, prio, prop
) VALUES (
1, 2, 2
);
1, 3
);
-INSERT INTO child_config_algorithm (
- child_cfg, prio, alg
+INSERT INTO child_config_proposal (
+ child_cfg, prio, prop
) VALUES (
1, 1, 3
);
-INSERT INTO child_config_algorithm (
- child_cfg, prio, alg
+INSERT INTO child_config_proposal (
+ child_cfg, prio, prop
) VALUES (
2, 1, 4
);
-INSERT INTO child_config_algorithm (
- child_cfg, prio, alg
+INSERT INTO child_config_proposal (
+ child_cfg, prio, prop
) VALUES (
3, 1, 3
);
-INSERT INTO child_config_algorithm (
- child_cfg, prio, alg
+INSERT INTO child_config_proposal (
+ child_cfg, prio, prop
) VALUES (
3, 2, 4
);
1, 6
);
-/* Algorithms */
+/* Proposals */
-INSERT INTO algorithms (
- algorithm
+INSERT INTO proposals (
+ proposal
) VALUES (
'aes128-sha256-modp2048'
);
-INSERT INTO algorithms (
- algorithm
+INSERT INTO proposals (
+ proposal
) VALUES (
'aes192-sha384-modp3072'
);
-INSERT INTO algorithms (
- algorithm
+INSERT INTO proposals (
+ proposal
) VALUES (
'aes128gcm128'
);
-INSERT INTO algorithms (
- algorithm
+INSERT INTO proposals (
+ proposal
) VALUES (
'aes192gcm128'
);
'PH_IP_SUN', 'PH_IP_MOON'
);
-INSERT INTO ike_config_algorithm (
- ike_cfg, prio, alg
+INSERT INTO ike_config_proposal (
+ ike_cfg, prio, prop
) VALUES (
1, 1, 1
);
-INSERT INTO ike_config_algorithm (
- ike_cfg, prio, alg
+INSERT INTO ike_config_proposal (
+ ike_cfg, prio, prop
) VALUES (
1, 2, 2
);
1, 3
);
-INSERT INTO child_config_algorithm (
- child_cfg, prio, alg
+INSERT INTO child_config_proposal (
+ child_cfg, prio, prop
) VALUES (
1, 1, 3
);
-INSERT INTO child_config_algorithm (
- child_cfg, prio, alg
+INSERT INTO child_config_proposal (
+ child_cfg, prio, prop
) VALUES (
2, 1, 4
);
-INSERT INTO child_config_algorithm (
- child_cfg, prio, alg
+INSERT INTO child_config_proposal (
+ child_cfg, prio, prop
) VALUES (
3, 1, 4
);