Remove auth and encrypt settings (security mode 3)

5 files changed, 1 insertions, 39 deletions

diff --git a/hcid/hcid.conf b/hcid/hcid.conf
index f15c02ec..74e72fa4 100644
--- a/hcid/hcid.conf
+++ b/hcid/hcid.conf
@@ -54,8 +54,4 @@ device {
 	#   sniff   - allow sniff mode
 	#   park    - allow park mode
 	lp rswitch,hold,sniff,park;
-
-	# Authentication and Encryption (Security Mode 3)
-	#auth enable;
-	#encrypt enable;
 }
diff --git a/hcid/hcid.h b/hcid/hcid.h
index 6ec358c0..3714a666 100644
--- a/hcid/hcid.h
+++ b/hcid/hcid.h
@@ -72,8 +72,6 @@ struct device_opts {
 	uint16_t link_mode;
 	uint16_t link_policy;
 	uint16_t scan;
-	uint16_t auth;
-	uint16_t encrypt;
 	int      discovto;
 };
 
diff --git a/hcid/kword.c b/hcid/kword.c
index efe4cd13..e96cad20 100644
--- a/hcid/kword.c
+++ b/hcid/kword.c
@@ -58,8 +58,6 @@ struct kword cfg_keyword[] = {
 	{ "voice",		K_VOICE		},
 	{ "pageto",		K_PAGETO	},
 	{ "discovto",		K_DISCOVTO	},
-	{ "auth",		K_AUTH		},
-	{ "encrypt",		K_ENCRYPT	},
 	{ "passkey",		K_PASSKEY	},
 
 	{ "yes",		K_YES		},
diff --git a/hcid/main.c b/hcid/main.c
index 5228f479..4dcf2510 100644
--- a/hcid/main.c
+++ b/hcid/main.c
@@ -308,28 +308,6 @@ static void configure_device(int hdev)
 				hdev, strerror(errno), errno);
 	}
 
-	/* Set authentication */
-	if (device_opts->auth)
-		dr.dev_opt = AUTH_ENABLED;
-	else
-		dr.dev_opt = AUTH_DISABLED;
-
-	if (ioctl(s, HCISETAUTH, (unsigned long) &dr) < 0) {
-		error("Can't set auth on hci%d: %s (%d)",
-						hdev, strerror(errno), errno);
-	}
-
-	/* Set encryption */
-	if (device_opts->encrypt)
-		dr.dev_opt = ENCRYPT_P2P;
-	else
-		dr.dev_opt = ENCRYPT_DISABLED;
-
-	if (ioctl(s, HCISETENCRYPT, (unsigned long) &dr) < 0) {
-		error("Can't set encrypt on hci%d: %s (%d)",
-						hdev, strerror(errno), errno);
-	}
-
 	/* Set device name */
 	if ((device_opts->flags & (1 << HCID_SET_NAME)) && device_opts->name) {
 		change_local_name_cp cp;
diff --git a/hcid/parser.y b/hcid/parser.y
index b13fbb13..aae915e9 100644
--- a/hcid/parser.y
+++ b/hcid/parser.y
@@ -59,7 +59,7 @@ int yyerror(char *s);
 
 %token K_OPTIONS K_DEVICE
 %token K_AUTOINIT K_SECURITY K_PAIRING
-%token K_PTYPE K_NAME K_CLASS K_VOICE K_PAGETO K_LM K_LP K_AUTH K_ENCRYPT K_ISCAN K_PSCAN K_DISCOVTO
+%token K_PTYPE K_NAME K_CLASS K_VOICE K_PAGETO K_LM K_LP K_ISCAN K_PSCAN K_DISCOVTO
 %token K_PASSKEY
 %token K_YES K_NO
 
@@ -199,14 +199,6 @@ device_opt:
 				parser_device->discovto = $2;
 			}
 
-  | K_AUTH bool		{
-				parser_device->auth = $2;
-			}
-
-  | K_ENCRYPT bool	{
-				 parser_device->encrypt = $2;
-			}
-
   | K_ISCAN bool	{
 				if ($2)
 					parser_device->scan |=  SCAN_INQUIRY;