From 17613ce8c1a08d5b28fcf59a8d28fc5e9f2f4795 Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Fri, 15 Apr 2016 19:07:47 -0700
Subject: [PATCH] move hkdf out of util/, remove now-empty directory

---
 setup.py                            | 2 +-
 src/txwormhole/transcribe.py        | 2 +-
 src/txwormhole/transit.py           | 2 +-
 src/wormhole/blocking/transcribe.py | 2 +-
 src/wormhole/{util => }/hkdf.py     | 0
 src/wormhole/util/__init__.py       | 0
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename src/wormhole/{util => }/hkdf.py (100%)
 delete mode 100644 src/wormhole/util/__init__.py

diff --git a/setup.py b/setup.py
index 9124ef9..457e0e7 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ setup(name="magic-wormhole",
                 "wormhole.blocking",
                 "txwormhole",
                 "wormhole_cli",
-                "wormhole.test", "wormhole.util",
+                "wormhole.test",
                 "wormhole_server"],
       package_data={"wormhole_server": ["db-schemas/*.sql"]},
       entry_points={"console_scripts":
diff --git a/src/txwormhole/transcribe.py b/src/txwormhole/transcribe.py
index cdb1aae..9932463 100644
--- a/src/txwormhole/transcribe.py
+++ b/src/txwormhole/transcribe.py
@@ -18,7 +18,7 @@ from wormhole import __version__
 from wormhole import codes
 from wormhole.errors import ServerError, Timeout, WrongPasswordError, UsageError
 from wormhole.timing import DebugTiming
-from wormhole.util.hkdf import HKDF
+from wormhole.hkdf import HKDF
 from wormhole.channel_monitor import monitor
 
 CONFMSG_NONCE_LENGTH = 128//8
diff --git a/src/txwormhole/transit.py b/src/txwormhole/transit.py
index 81afa41..f3145be 100644
--- a/src/txwormhole/transit.py
+++ b/src/txwormhole/transit.py
@@ -8,7 +8,7 @@ from twisted.internet import (reactor, interfaces, defer, protocol,
 from twisted.internet.defer import inlineCallbacks, returnValue
 from twisted.protocols import policies
 from nacl.secret import SecretBox
-from wormhole.util.hkdf import HKDF
+from wormhole.hkdf import HKDF
 from wormhole.errors import UsageError
 from wormhole.timing import DebugTiming
 from . import ipaddrs
diff --git a/src/wormhole/blocking/transcribe.py b/src/wormhole/blocking/transcribe.py
index 0c1bdf8..38bb2cf 100644
--- a/src/wormhole/blocking/transcribe.py
+++ b/src/wormhole/blocking/transcribe.py
@@ -11,7 +11,7 @@ from .. import __version__
 from .. import codes
 from ..errors import ServerError, Timeout, WrongPasswordError, UsageError
 from ..timing import DebugTiming
-from ..util.hkdf import HKDF
+from ..hkdf import HKDF
 from ..channel_monitor import monitor
 
 SECOND = 1
diff --git a/src/wormhole/util/hkdf.py b/src/wormhole/hkdf.py
similarity index 100%
rename from src/wormhole/util/hkdf.py
rename to src/wormhole/hkdf.py
diff --git a/src/wormhole/util/__init__.py b/src/wormhole/util/__init__.py
deleted file mode 100644
index e69de29..0000000