NEW - bug 317925: [Discovery][DNS-SD] Add support for signing DNS messages

https://bugs.eclipse.org/bugs/show_bug.cgi?id=317925

2 files changed, 15 insertions, 2 deletions

diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Activator.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Activator.java
index 5bea7af1d..561fa1c3f 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Activator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/Activator.java
@@ -130,12 +130,17 @@ public class Activator implements BundleActivator, ManagedServiceFactory {
 					locator.setResolver(resolver);
 				}
 				
+				final String tsigKey = (String) properties.get(IDnsSdDiscoveryConstants.CA_TSIG_KEY);
+				if(tsigKey != null) {
+					locator.setTsigKey(tsigKey);
+				}
+				
 				locator.connect(targetID, null);
 				serviceRegistrations.put(pid, context.registerService(IDiscoveryLocator.class.getName(), locator, props));
 			} catch (ContainerConnectException e) {
-				throw new ConfigurationException("", "", e);
+				throw new ConfigurationException("IDnsSdDiscoveryConstants properties", e.getLocalizedMessage(), e);
 			} catch (ClassCastException cce) {
-				throw new ConfigurationException("", "", cce);
+				throw new ConfigurationException("IDnsSdDiscoveryConstants properties", cce.getLocalizedMessage(), cce);
 			}
 		}
 	}
diff --git a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java
index 1f1593d3e..346e85b4b 100644
--- a/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java
+++ b/providers/bundles/org.eclipse.ecf.provider.dnssd/src/org/eclipse/ecf/provider/dnssd/DnsSdDiscoveryLocator.java
@@ -44,6 +44,7 @@ import org.xbill.DNS.Resolver;
 import org.xbill.DNS.ResolverConfig;
 import org.xbill.DNS.SRVRecord;
 import org.xbill.DNS.SimpleResolver;
+import org.xbill.DNS.TSIG;
 import org.xbill.DNS.TXTRecord;
 import org.xbill.DNS.Type;
 
@@ -353,4 +354,11 @@ public class DnsSdDiscoveryLocator extends AbstractDiscoveryContainerAdapter {
 			throw new DnsSdDiscoveryException(e);
 		}
 	}
+
+	/**
+	 * @param tsigKey Sets the TSIG key to be used to sign requests
+	 */
+	public void setTsigKey(String aTsigKey) {
+		resolver.setTSIGKey(new TSIG("default", aTsigKey));
+	}
 }