From 349037855133e4a77ee44aee51243700cadef5d0 Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Thu, 14 Dec 2006 03:39:50 -0700
Subject: [PATCH] move all packages into src/, fix allmydata.Crypto build. Now
 you must perform a 'setup.py build' before using anything, and you must add
 the build directory (build/lib.linux-i686-2.4) to your PYTHONPATH before
 doing anything

---
 setup.py                                      | 59 ++++++++++---------
 {Crypto => src/Crypto}/ACKS                   |  0
 {Crypto => src/Crypto}/ChangeLog              |  0
 {Crypto => src/Crypto}/Cipher/__init__.py     |  0
 {Crypto => src/Crypto}/Demo/README            |  0
 {Crypto => src/Crypto}/Demo/chaum.py          |  0
 {Crypto => src/Crypto}/Demo/cipher            |  0
 {Crypto => src/Crypto}/Demo/enc.py            |  0
 {Crypto => src/Crypto}/Demo/secimp/README     |  0
 {Crypto => src/Crypto}/Demo/secimp/secimp.py  |  0
 {Crypto => src/Crypto}/Demo/secimp/sign.py    |  0
 {Crypto => src/Crypto}/Demo/secimp/testkey.py |  0
 {Crypto => src/Crypto}/Doc/pycrypt.tex        |  0
 {Crypto => src/Crypto}/Hash/HMAC.py           |  0
 {Crypto => src/Crypto}/Hash/MD5.py            |  0
 {Crypto => src/Crypto}/Hash/SHA.py            |  0
 {Crypto => src/Crypto}/Hash/__init__.py       |  0
 {Crypto => src/Crypto}/LICENSE                |  0
 {Crypto => src/Crypto}/MANIFEST               |  0
 {Crypto => src/Crypto}/PKG-INFO               |  0
 .../Crypto}/Protocol/AllOrNothing.py          |  0
 {Crypto => src/Crypto}/Protocol/Chaffing.py   |  0
 {Crypto => src/Crypto}/Protocol/__init__.py   |  0
 {Crypto => src/Crypto}/PublicKey/DSA.py       |  0
 {Crypto => src/Crypto}/PublicKey/ElGamal.py   |  0
 {Crypto => src/Crypto}/PublicKey/RSA.py       |  0
 {Crypto => src/Crypto}/PublicKey/__init__.py  |  0
 {Crypto => src/Crypto}/PublicKey/pubkey.py    |  0
 {Crypto => src/Crypto}/PublicKey/qNEW.py      |  0
 .../Crypto}/PublicKey/test/rsa_speed.py       |  0
 {Crypto => src/Crypto}/README                 |  0
 {Crypto => src/Crypto}/TODO                   |  0
 {Crypto => src/Crypto}/Util/RFC1751.py        |  0
 {Crypto => src/Crypto}/Util/__init__.py       |  0
 {Crypto => src/Crypto}/Util/bench.py          |  0
 {Crypto => src/Crypto}/Util/number.py         |  0
 {Crypto => src/Crypto}/Util/randpool.py       |  0
 {Crypto => src/Crypto}/Util/test.py           |  0
 .../Crypto}/Util/test/prime_speed.py          |  0
 {Crypto => src/Crypto}/__init__.py            |  0
 {Crypto => src/Crypto}/bench.py               |  0
 {Crypto => src/Crypto}/debian/README.Debian   |  0
 {Crypto => src/Crypto}/debian/changelog       |  0
 {Crypto => src/Crypto}/debian/compat          |  0
 {Crypto => src/Crypto}/debian/control         |  0
 {Crypto => src/Crypto}/debian/copyright       |  0
 {Crypto => src/Crypto}/debian/dirs            |  0
 {Crypto => src/Crypto}/debian/pathmangle.sh   |  0
 .../Crypto}/debian/python2.3-amdcrypto.docs   |  0
 .../Crypto}/debian/python2.4-amdcrypto.docs   |  0
 {Crypto => src/Crypto}/debian/rules           |  0
 {Crypto => src/Crypto}/setup.py               |  0
 {Crypto => src/Crypto}/src/AES.c              |  0
 {Crypto => src/Crypto}/src/ARC2.c             |  0
 {Crypto => src/Crypto}/src/ARC4.c             |  0
 {Crypto => src/Crypto}/src/Blowfish.c         |  0
 {Crypto => src/Crypto}/src/CAST.c             |  0
 {Crypto => src/Crypto}/src/DES.c              |  0
 {Crypto => src/Crypto}/src/DES3.c             |  0
 {Crypto => src/Crypto}/src/MD2.c              |  0
 {Crypto => src/Crypto}/src/MD4.c              |  0
 {Crypto => src/Crypto}/src/SHA256.c           |  0
 {Crypto => src/Crypto}/src/XOR.c              |  0
 {Crypto => src/Crypto}/src/_dsa.c             |  0
 {Crypto => src/Crypto}/src/_fastmath.c        |  0
 {Crypto => src/Crypto}/src/_rsa.c             |  0
 {Crypto => src/Crypto}/src/block_template.c   |  2 +-
 {Crypto => src/Crypto}/src/cast5.c            |  0
 {Crypto => src/Crypto}/src/hash_template.c    |  2 +-
 {Crypto => src/Crypto}/src/stream_template.c  |  2 +-
 {Crypto => src/Crypto}/src/winrand.c          |  0
 {Crypto => src/Crypto}/test.py                |  0
 {Crypto => src/Crypto}/test/template          |  0
 {Crypto => src/Crypto}/test/test_chaffing.py  |  0
 {Crypto => src/Crypto}/test/test_hashes.py    |  0
 {Crypto => src/Crypto}/test/test_number.py    |  0
 {Crypto => src/Crypto}/test/test_publickey.py |  0
 {Crypto => src/Crypto}/test/test_randpool.py  |  0
 {Crypto => src/Crypto}/test/test_rfc1751.py   |  0
 {Crypto => src/Crypto}/test/testdata.py       |  0
 {allmydata => src/allmydata}/__init__.py      |  0
 {allmydata => src/allmydata}/bucketstore.py   |  0
 {allmydata => src/allmydata}/chunk.py         |  0
 {allmydata => src/allmydata}/client.py        |  0
 {allmydata => src/allmydata}/debugshell.py    |  0
 {allmydata => src/allmydata}/download.py      |  0
 {allmydata => src/allmydata}/encode.py        |  0
 {allmydata => src/allmydata}/encode_new.py    |  0
 {allmydata => src/allmydata}/filetable.py     |  0
 {allmydata => src/allmydata}/interfaces.py    |  0
 {allmydata => src/allmydata}/manhole.py       |  0
 {allmydata => src/allmydata}/node.py          |  0
 {allmydata => src/allmydata}/queen.py         |  0
 .../allmydata}/scripts/__init__.py            |  0
 .../allmydata}/scripts/runner.py              |  0
 {allmydata => src/allmydata}/storageserver.py |  0
 {allmydata => src/allmydata}/test/__init__.py |  0
 .../allmydata}/test/figleaf.excludes          |  0
 .../allmydata}/test/test_client.py            |  0
 .../allmydata}/test/test_encode.py            |  0
 .../allmydata}/test/test_filetable.py         |  0
 .../allmydata}/test/test_queen.py             |  0
 .../allmydata}/test/test_storage.py           |  0
 .../allmydata}/test/test_system.py            |  0
 .../allmydata}/test/test_upload.py            |  0
 .../allmydata}/test/test_vdrive.py            |  0
 .../allmydata}/test/trial_figleaf.py          |  0
 {allmydata => src/allmydata}/upload.py        |  0
 {allmydata => src/allmydata}/util/__init__.py |  0
 .../allmydata}/util/assertutil.py             |  0
 {allmydata => src/allmydata}/util/bencode.py  |  0
 .../allmydata}/util/humanreadable.py          |  0
 {allmydata => src/allmydata}/util/idlib.py    |  0
 {allmydata => src/allmydata}/util/iputil.py   |  0
 {allmydata => src/allmydata}/vdrive.py        |  0
 .../allmydata}/web/directory.xhtml            |  0
 .../allmydata}/web/welcome.xhtml              |  0
 {allmydata => src/allmydata}/webish.py        |  0
 118 files changed, 33 insertions(+), 32 deletions(-)
 rename {Crypto => src/Crypto}/ACKS (100%)
 rename {Crypto => src/Crypto}/ChangeLog (100%)
 rename {Crypto => src/Crypto}/Cipher/__init__.py (100%)
 rename {Crypto => src/Crypto}/Demo/README (100%)
 rename {Crypto => src/Crypto}/Demo/chaum.py (100%)
 rename {Crypto => src/Crypto}/Demo/cipher (100%)
 rename {Crypto => src/Crypto}/Demo/enc.py (100%)
 rename {Crypto => src/Crypto}/Demo/secimp/README (100%)
 rename {Crypto => src/Crypto}/Demo/secimp/secimp.py (100%)
 rename {Crypto => src/Crypto}/Demo/secimp/sign.py (100%)
 rename {Crypto => src/Crypto}/Demo/secimp/testkey.py (100%)
 rename {Crypto => src/Crypto}/Doc/pycrypt.tex (100%)
 rename {Crypto => src/Crypto}/Hash/HMAC.py (100%)
 rename {Crypto => src/Crypto}/Hash/MD5.py (100%)
 rename {Crypto => src/Crypto}/Hash/SHA.py (100%)
 rename {Crypto => src/Crypto}/Hash/__init__.py (100%)
 rename {Crypto => src/Crypto}/LICENSE (100%)
 rename {Crypto => src/Crypto}/MANIFEST (100%)
 rename {Crypto => src/Crypto}/PKG-INFO (100%)
 rename {Crypto => src/Crypto}/Protocol/AllOrNothing.py (100%)
 rename {Crypto => src/Crypto}/Protocol/Chaffing.py (100%)
 rename {Crypto => src/Crypto}/Protocol/__init__.py (100%)
 rename {Crypto => src/Crypto}/PublicKey/DSA.py (100%)
 rename {Crypto => src/Crypto}/PublicKey/ElGamal.py (100%)
 rename {Crypto => src/Crypto}/PublicKey/RSA.py (100%)
 rename {Crypto => src/Crypto}/PublicKey/__init__.py (100%)
 rename {Crypto => src/Crypto}/PublicKey/pubkey.py (100%)
 rename {Crypto => src/Crypto}/PublicKey/qNEW.py (100%)
 rename {Crypto => src/Crypto}/PublicKey/test/rsa_speed.py (100%)
 rename {Crypto => src/Crypto}/README (100%)
 rename {Crypto => src/Crypto}/TODO (100%)
 rename {Crypto => src/Crypto}/Util/RFC1751.py (100%)
 rename {Crypto => src/Crypto}/Util/__init__.py (100%)
 rename {Crypto => src/Crypto}/Util/bench.py (100%)
 rename {Crypto => src/Crypto}/Util/number.py (100%)
 rename {Crypto => src/Crypto}/Util/randpool.py (100%)
 rename {Crypto => src/Crypto}/Util/test.py (100%)
 rename {Crypto => src/Crypto}/Util/test/prime_speed.py (100%)
 rename {Crypto => src/Crypto}/__init__.py (100%)
 rename {Crypto => src/Crypto}/bench.py (100%)
 rename {Crypto => src/Crypto}/debian/README.Debian (100%)
 rename {Crypto => src/Crypto}/debian/changelog (100%)
 rename {Crypto => src/Crypto}/debian/compat (100%)
 rename {Crypto => src/Crypto}/debian/control (100%)
 rename {Crypto => src/Crypto}/debian/copyright (100%)
 rename {Crypto => src/Crypto}/debian/dirs (100%)
 rename {Crypto => src/Crypto}/debian/pathmangle.sh (100%)
 rename {Crypto => src/Crypto}/debian/python2.3-amdcrypto.docs (100%)
 rename {Crypto => src/Crypto}/debian/python2.4-amdcrypto.docs (100%)
 rename {Crypto => src/Crypto}/debian/rules (100%)
 rename {Crypto => src/Crypto}/setup.py (100%)
 rename {Crypto => src/Crypto}/src/AES.c (100%)
 rename {Crypto => src/Crypto}/src/ARC2.c (100%)
 rename {Crypto => src/Crypto}/src/ARC4.c (100%)
 rename {Crypto => src/Crypto}/src/Blowfish.c (100%)
 rename {Crypto => src/Crypto}/src/CAST.c (100%)
 rename {Crypto => src/Crypto}/src/DES.c (100%)
 rename {Crypto => src/Crypto}/src/DES3.c (100%)
 rename {Crypto => src/Crypto}/src/MD2.c (100%)
 rename {Crypto => src/Crypto}/src/MD4.c (100%)
 rename {Crypto => src/Crypto}/src/SHA256.c (100%)
 rename {Crypto => src/Crypto}/src/XOR.c (100%)
 rename {Crypto => src/Crypto}/src/_dsa.c (100%)
 rename {Crypto => src/Crypto}/src/_fastmath.c (100%)
 rename {Crypto => src/Crypto}/src/_rsa.c (100%)
 rename {Crypto => src/Crypto}/src/block_template.c (99%)
 rename {Crypto => src/Crypto}/src/cast5.c (100%)
 rename {Crypto => src/Crypto}/src/hash_template.c (98%)
 rename {Crypto => src/Crypto}/src/stream_template.c (98%)
 rename {Crypto => src/Crypto}/src/winrand.c (100%)
 rename {Crypto => src/Crypto}/test.py (100%)
 rename {Crypto => src/Crypto}/test/template (100%)
 rename {Crypto => src/Crypto}/test/test_chaffing.py (100%)
 rename {Crypto => src/Crypto}/test/test_hashes.py (100%)
 rename {Crypto => src/Crypto}/test/test_number.py (100%)
 rename {Crypto => src/Crypto}/test/test_publickey.py (100%)
 rename {Crypto => src/Crypto}/test/test_randpool.py (100%)
 rename {Crypto => src/Crypto}/test/test_rfc1751.py (100%)
 rename {Crypto => src/Crypto}/test/testdata.py (100%)
 rename {allmydata => src/allmydata}/__init__.py (100%)
 rename {allmydata => src/allmydata}/bucketstore.py (100%)
 rename {allmydata => src/allmydata}/chunk.py (100%)
 rename {allmydata => src/allmydata}/client.py (100%)
 rename {allmydata => src/allmydata}/debugshell.py (100%)
 rename {allmydata => src/allmydata}/download.py (100%)
 rename {allmydata => src/allmydata}/encode.py (100%)
 rename {allmydata => src/allmydata}/encode_new.py (100%)
 rename {allmydata => src/allmydata}/filetable.py (100%)
 rename {allmydata => src/allmydata}/interfaces.py (100%)
 rename {allmydata => src/allmydata}/manhole.py (100%)
 rename {allmydata => src/allmydata}/node.py (100%)
 rename {allmydata => src/allmydata}/queen.py (100%)
 rename {allmydata => src/allmydata}/scripts/__init__.py (100%)
 rename {allmydata => src/allmydata}/scripts/runner.py (100%)
 rename {allmydata => src/allmydata}/storageserver.py (100%)
 rename {allmydata => src/allmydata}/test/__init__.py (100%)
 rename {allmydata => src/allmydata}/test/figleaf.excludes (100%)
 rename {allmydata => src/allmydata}/test/test_client.py (100%)
 rename {allmydata => src/allmydata}/test/test_encode.py (100%)
 rename {allmydata => src/allmydata}/test/test_filetable.py (100%)
 rename {allmydata => src/allmydata}/test/test_queen.py (100%)
 rename {allmydata => src/allmydata}/test/test_storage.py (100%)
 rename {allmydata => src/allmydata}/test/test_system.py (100%)
 rename {allmydata => src/allmydata}/test/test_upload.py (100%)
 rename {allmydata => src/allmydata}/test/test_vdrive.py (100%)
 rename {allmydata => src/allmydata}/test/trial_figleaf.py (100%)
 rename {allmydata => src/allmydata}/upload.py (100%)
 rename {allmydata => src/allmydata}/util/__init__.py (100%)
 rename {allmydata => src/allmydata}/util/assertutil.py (100%)
 rename {allmydata => src/allmydata}/util/bencode.py (100%)
 rename {allmydata => src/allmydata}/util/humanreadable.py (100%)
 rename {allmydata => src/allmydata}/util/idlib.py (100%)
 rename {allmydata => src/allmydata}/util/iputil.py (100%)
 rename {allmydata => src/allmydata}/vdrive.py (100%)
 rename {allmydata => src/allmydata}/web/directory.xhtml (100%)
 rename {allmydata => src/allmydata}/web/welcome.xhtml (100%)
 rename {allmydata => src/allmydata}/webish.py (100%)

diff --git a/setup.py b/setup.py
index 765990cd..0eddb778 100644
--- a/setup.py
+++ b/setup.py
@@ -17,11 +17,11 @@ if sys.platform == 'win32':
     plat_ext = [
                 Extension("Crypto.Util.winrandom",
                           libraries = HTONS_LIBS + ['advapi32'],
-                          include_dirs=['Crypto/src/'],
+                          include_dirs=['src/Crypto/src/'],
                           extra_compile_args=['-O0 -g',],
                           extra_link_args=['-g',],
                           undef_macros=['NDEBUG',],
-                          sources=["Crypto/src/winrand.c"],
+                          sources=["src/Crypto/src/winrand.c"],
                           **debug_build_kw)
                ]
 else:
@@ -81,48 +81,48 @@ class PCTBuildExt (build_ext):
         self.extensions += [
             # Hash functions
             Extension("allmydata.Crypto.Hash.MD4",
-                      include_dirs=['Crypto/src/'],
-                      sources=["Crypto/src/MD4.c"],
+                      include_dirs=['src/Crypto/src/'],
+                      sources=["src/Crypto/src/MD4.c"],
                       **debug_build_kw),
             Extension("allmydata.Crypto.Hash.SHA256",
-                      include_dirs=['Crypto/src/'],
-                      sources=["Crypto/src/SHA256.c"],
+                      include_dirs=['src/Crypto/src/'],
+                      sources=["src/Crypto/src/SHA256.c"],
                       **debug_build_kw),
 
             # Block encryption algorithms
             Extension("allmydata.Crypto.Cipher.AES",
-                      include_dirs=['Crypto/src/'],
-                      sources=["Crypto/src/AES.c"],
+                      include_dirs=['src/Crypto/src/'],
+                      sources=["src/Crypto/src/AES.c"],
                       **debug_build_kw),
             Extension("allmydata.Crypto.Cipher.ARC2",
-                      include_dirs=['Crypto/src/'],
-                      sources=["Crypto/src/ARC2.c"],
+                      include_dirs=['src/Crypto/src/'],
+                      sources=["src/Crypto/src/ARC2.c"],
                       **debug_build_kw),
             Extension("allmydata.Crypto.Cipher.Blowfish",
-                      include_dirs=['Crypto/src/'],
-                      sources=["Crypto/src/Blowfish.c"],
+                      include_dirs=['src/Crypto/src/'],
+                      sources=["src/Crypto/src/Blowfish.c"],
                       **debug_build_kw),
             Extension("allmydata.Crypto.Cipher.CAST",
-                      include_dirs=['Crypto/src/'],
-                      sources=["Crypto/src/CAST.c"],
+                      include_dirs=['src/Crypto/src/'],
+                      sources=["src/Crypto/src/CAST.c"],
                       **debug_build_kw),
             Extension("allmydata.Crypto.Cipher.DES",
-                      include_dirs=['Crypto/src/'],
-                      sources=["Crypto/src/DES.c"],
+                      include_dirs=['src/Crypto/src/'],
+                      sources=["src/Crypto/src/DES.c"],
                       **debug_build_kw),
             Extension("allmydata.Crypto.Cipher.DES3",
-                      include_dirs=['Crypto/src/'],
-                      sources=["Crypto/src/DES3.c"],
+                      include_dirs=['src/Crypto/src/'],
+                      sources=["src/Crypto/src/DES3.c"],
                       **debug_build_kw),
 
             # Stream ciphers
             Extension("allmydata.Crypto.Cipher.ARC4",
-                      include_dirs=['Crypto/src/'],
-                      sources=["Crypto/src/ARC4.c"],
+                      include_dirs=['src/Crypto/src/'],
+                      sources=["src/Crypto/src/ARC4.c"],
                       **debug_build_kw),
             Extension("allmydata.Crypto.Cipher.XOR",
-                      include_dirs=['Crypto/src/'],
-                      sources=["Crypto/src/XOR.c"],
+                      include_dirs=['src/Crypto/src/'],
+                      sources=["src/Crypto/src/XOR.c"],
                       **debug_build_kw),
             ]
 
@@ -140,9 +140,9 @@ class PCTBuildExt (build_ext):
         exts = []
         if (self.compiler.find_library_file(lib_dirs, 'gmp')):
             exts.append(Extension("allmydata.Crypto.PublicKey._fastmath",
-                                  include_dirs=['Crypto/src/'],
+                                  include_dirs=['src/Crypto/src/'],
                                   libraries=['gmp'],
-                                  sources=["Crypto/src/_fastmath.c"]))
+                                  sources=["src/Crypto/src/_fastmath.c"]))
         self.extensions += exts
 
 
@@ -183,13 +183,14 @@ setup(
     name="AllMyData",
     version="0.0.1",
     #packages=find_packages('.'),
-    packages=["allmydata", "allmydata/test", "allmydata/util",
-              "allmydata/scripts",
+    packages=["allmydata", "allmydata.test", "allmydata.util",
+              "allmydata.scripts",
               "allmydata.Crypto", "allmydata.Crypto.Hash",
               "allmydata.Crypto.Cipher", "allmydata.Crypto.Util",
               "allmydata.Crypto.Protocol", "allmydata.Crypto.PublicKey"
               ],
-    package_dir={ "allmydata.Crypto": "Crypto" },
+    package_dir={ "allmydata": "src/allmydata",
+                  "allmydata.Crypto": "src/Crypto" },
     scripts = ["bin/allmydata"],
     package_data={ 'allmydata': ['web/*.xhtml'] },
 
@@ -197,8 +198,8 @@ setup(
       # One module is defined here, because build_ext won't be
       # called unless there's at least one extension module defined.
     ext_modules=[Extension("allmydata.Crypto.Hash.MD2",
-                           include_dirs=['Crypto/src/'],
-                           sources=["Crypto/src/MD2.c"])],
+                           include_dirs=['src/Crypto/src/'],
+                           sources=["src/Crypto/src/MD2.c"])],
 
     description="AllMyData (tahoe2)",
     )
diff --git a/Crypto/ACKS b/src/Crypto/ACKS
similarity index 100%
rename from Crypto/ACKS
rename to src/Crypto/ACKS
diff --git a/Crypto/ChangeLog b/src/Crypto/ChangeLog
similarity index 100%
rename from Crypto/ChangeLog
rename to src/Crypto/ChangeLog
diff --git a/Crypto/Cipher/__init__.py b/src/Crypto/Cipher/__init__.py
similarity index 100%
rename from Crypto/Cipher/__init__.py
rename to src/Crypto/Cipher/__init__.py
diff --git a/Crypto/Demo/README b/src/Crypto/Demo/README
similarity index 100%
rename from Crypto/Demo/README
rename to src/Crypto/Demo/README
diff --git a/Crypto/Demo/chaum.py b/src/Crypto/Demo/chaum.py
similarity index 100%
rename from Crypto/Demo/chaum.py
rename to src/Crypto/Demo/chaum.py
diff --git a/Crypto/Demo/cipher b/src/Crypto/Demo/cipher
similarity index 100%
rename from Crypto/Demo/cipher
rename to src/Crypto/Demo/cipher
diff --git a/Crypto/Demo/enc.py b/src/Crypto/Demo/enc.py
similarity index 100%
rename from Crypto/Demo/enc.py
rename to src/Crypto/Demo/enc.py
diff --git a/Crypto/Demo/secimp/README b/src/Crypto/Demo/secimp/README
similarity index 100%
rename from Crypto/Demo/secimp/README
rename to src/Crypto/Demo/secimp/README
diff --git a/Crypto/Demo/secimp/secimp.py b/src/Crypto/Demo/secimp/secimp.py
similarity index 100%
rename from Crypto/Demo/secimp/secimp.py
rename to src/Crypto/Demo/secimp/secimp.py
diff --git a/Crypto/Demo/secimp/sign.py b/src/Crypto/Demo/secimp/sign.py
similarity index 100%
rename from Crypto/Demo/secimp/sign.py
rename to src/Crypto/Demo/secimp/sign.py
diff --git a/Crypto/Demo/secimp/testkey.py b/src/Crypto/Demo/secimp/testkey.py
similarity index 100%
rename from Crypto/Demo/secimp/testkey.py
rename to src/Crypto/Demo/secimp/testkey.py
diff --git a/Crypto/Doc/pycrypt.tex b/src/Crypto/Doc/pycrypt.tex
similarity index 100%
rename from Crypto/Doc/pycrypt.tex
rename to src/Crypto/Doc/pycrypt.tex
diff --git a/Crypto/Hash/HMAC.py b/src/Crypto/Hash/HMAC.py
similarity index 100%
rename from Crypto/Hash/HMAC.py
rename to src/Crypto/Hash/HMAC.py
diff --git a/Crypto/Hash/MD5.py b/src/Crypto/Hash/MD5.py
similarity index 100%
rename from Crypto/Hash/MD5.py
rename to src/Crypto/Hash/MD5.py
diff --git a/Crypto/Hash/SHA.py b/src/Crypto/Hash/SHA.py
similarity index 100%
rename from Crypto/Hash/SHA.py
rename to src/Crypto/Hash/SHA.py
diff --git a/Crypto/Hash/__init__.py b/src/Crypto/Hash/__init__.py
similarity index 100%
rename from Crypto/Hash/__init__.py
rename to src/Crypto/Hash/__init__.py
diff --git a/Crypto/LICENSE b/src/Crypto/LICENSE
similarity index 100%
rename from Crypto/LICENSE
rename to src/Crypto/LICENSE
diff --git a/Crypto/MANIFEST b/src/Crypto/MANIFEST
similarity index 100%
rename from Crypto/MANIFEST
rename to src/Crypto/MANIFEST
diff --git a/Crypto/PKG-INFO b/src/Crypto/PKG-INFO
similarity index 100%
rename from Crypto/PKG-INFO
rename to src/Crypto/PKG-INFO
diff --git a/Crypto/Protocol/AllOrNothing.py b/src/Crypto/Protocol/AllOrNothing.py
similarity index 100%
rename from Crypto/Protocol/AllOrNothing.py
rename to src/Crypto/Protocol/AllOrNothing.py
diff --git a/Crypto/Protocol/Chaffing.py b/src/Crypto/Protocol/Chaffing.py
similarity index 100%
rename from Crypto/Protocol/Chaffing.py
rename to src/Crypto/Protocol/Chaffing.py
diff --git a/Crypto/Protocol/__init__.py b/src/Crypto/Protocol/__init__.py
similarity index 100%
rename from Crypto/Protocol/__init__.py
rename to src/Crypto/Protocol/__init__.py
diff --git a/Crypto/PublicKey/DSA.py b/src/Crypto/PublicKey/DSA.py
similarity index 100%
rename from Crypto/PublicKey/DSA.py
rename to src/Crypto/PublicKey/DSA.py
diff --git a/Crypto/PublicKey/ElGamal.py b/src/Crypto/PublicKey/ElGamal.py
similarity index 100%
rename from Crypto/PublicKey/ElGamal.py
rename to src/Crypto/PublicKey/ElGamal.py
diff --git a/Crypto/PublicKey/RSA.py b/src/Crypto/PublicKey/RSA.py
similarity index 100%
rename from Crypto/PublicKey/RSA.py
rename to src/Crypto/PublicKey/RSA.py
diff --git a/Crypto/PublicKey/__init__.py b/src/Crypto/PublicKey/__init__.py
similarity index 100%
rename from Crypto/PublicKey/__init__.py
rename to src/Crypto/PublicKey/__init__.py
diff --git a/Crypto/PublicKey/pubkey.py b/src/Crypto/PublicKey/pubkey.py
similarity index 100%
rename from Crypto/PublicKey/pubkey.py
rename to src/Crypto/PublicKey/pubkey.py
diff --git a/Crypto/PublicKey/qNEW.py b/src/Crypto/PublicKey/qNEW.py
similarity index 100%
rename from Crypto/PublicKey/qNEW.py
rename to src/Crypto/PublicKey/qNEW.py
diff --git a/Crypto/PublicKey/test/rsa_speed.py b/src/Crypto/PublicKey/test/rsa_speed.py
similarity index 100%
rename from Crypto/PublicKey/test/rsa_speed.py
rename to src/Crypto/PublicKey/test/rsa_speed.py
diff --git a/Crypto/README b/src/Crypto/README
similarity index 100%
rename from Crypto/README
rename to src/Crypto/README
diff --git a/Crypto/TODO b/src/Crypto/TODO
similarity index 100%
rename from Crypto/TODO
rename to src/Crypto/TODO
diff --git a/Crypto/Util/RFC1751.py b/src/Crypto/Util/RFC1751.py
similarity index 100%
rename from Crypto/Util/RFC1751.py
rename to src/Crypto/Util/RFC1751.py
diff --git a/Crypto/Util/__init__.py b/src/Crypto/Util/__init__.py
similarity index 100%
rename from Crypto/Util/__init__.py
rename to src/Crypto/Util/__init__.py
diff --git a/Crypto/Util/bench.py b/src/Crypto/Util/bench.py
similarity index 100%
rename from Crypto/Util/bench.py
rename to src/Crypto/Util/bench.py
diff --git a/Crypto/Util/number.py b/src/Crypto/Util/number.py
similarity index 100%
rename from Crypto/Util/number.py
rename to src/Crypto/Util/number.py
diff --git a/Crypto/Util/randpool.py b/src/Crypto/Util/randpool.py
similarity index 100%
rename from Crypto/Util/randpool.py
rename to src/Crypto/Util/randpool.py
diff --git a/Crypto/Util/test.py b/src/Crypto/Util/test.py
similarity index 100%
rename from Crypto/Util/test.py
rename to src/Crypto/Util/test.py
diff --git a/Crypto/Util/test/prime_speed.py b/src/Crypto/Util/test/prime_speed.py
similarity index 100%
rename from Crypto/Util/test/prime_speed.py
rename to src/Crypto/Util/test/prime_speed.py
diff --git a/Crypto/__init__.py b/src/Crypto/__init__.py
similarity index 100%
rename from Crypto/__init__.py
rename to src/Crypto/__init__.py
diff --git a/Crypto/bench.py b/src/Crypto/bench.py
similarity index 100%
rename from Crypto/bench.py
rename to src/Crypto/bench.py
diff --git a/Crypto/debian/README.Debian b/src/Crypto/debian/README.Debian
similarity index 100%
rename from Crypto/debian/README.Debian
rename to src/Crypto/debian/README.Debian
diff --git a/Crypto/debian/changelog b/src/Crypto/debian/changelog
similarity index 100%
rename from Crypto/debian/changelog
rename to src/Crypto/debian/changelog
diff --git a/Crypto/debian/compat b/src/Crypto/debian/compat
similarity index 100%
rename from Crypto/debian/compat
rename to src/Crypto/debian/compat
diff --git a/Crypto/debian/control b/src/Crypto/debian/control
similarity index 100%
rename from Crypto/debian/control
rename to src/Crypto/debian/control
diff --git a/Crypto/debian/copyright b/src/Crypto/debian/copyright
similarity index 100%
rename from Crypto/debian/copyright
rename to src/Crypto/debian/copyright
diff --git a/Crypto/debian/dirs b/src/Crypto/debian/dirs
similarity index 100%
rename from Crypto/debian/dirs
rename to src/Crypto/debian/dirs
diff --git a/Crypto/debian/pathmangle.sh b/src/Crypto/debian/pathmangle.sh
similarity index 100%
rename from Crypto/debian/pathmangle.sh
rename to src/Crypto/debian/pathmangle.sh
diff --git a/Crypto/debian/python2.3-amdcrypto.docs b/src/Crypto/debian/python2.3-amdcrypto.docs
similarity index 100%
rename from Crypto/debian/python2.3-amdcrypto.docs
rename to src/Crypto/debian/python2.3-amdcrypto.docs
diff --git a/Crypto/debian/python2.4-amdcrypto.docs b/src/Crypto/debian/python2.4-amdcrypto.docs
similarity index 100%
rename from Crypto/debian/python2.4-amdcrypto.docs
rename to src/Crypto/debian/python2.4-amdcrypto.docs
diff --git a/Crypto/debian/rules b/src/Crypto/debian/rules
similarity index 100%
rename from Crypto/debian/rules
rename to src/Crypto/debian/rules
diff --git a/Crypto/setup.py b/src/Crypto/setup.py
similarity index 100%
rename from Crypto/setup.py
rename to src/Crypto/setup.py
diff --git a/Crypto/src/AES.c b/src/Crypto/src/AES.c
similarity index 100%
rename from Crypto/src/AES.c
rename to src/Crypto/src/AES.c
diff --git a/Crypto/src/ARC2.c b/src/Crypto/src/ARC2.c
similarity index 100%
rename from Crypto/src/ARC2.c
rename to src/Crypto/src/ARC2.c
diff --git a/Crypto/src/ARC4.c b/src/Crypto/src/ARC4.c
similarity index 100%
rename from Crypto/src/ARC4.c
rename to src/Crypto/src/ARC4.c
diff --git a/Crypto/src/Blowfish.c b/src/Crypto/src/Blowfish.c
similarity index 100%
rename from Crypto/src/Blowfish.c
rename to src/Crypto/src/Blowfish.c
diff --git a/Crypto/src/CAST.c b/src/Crypto/src/CAST.c
similarity index 100%
rename from Crypto/src/CAST.c
rename to src/Crypto/src/CAST.c
diff --git a/Crypto/src/DES.c b/src/Crypto/src/DES.c
similarity index 100%
rename from Crypto/src/DES.c
rename to src/Crypto/src/DES.c
diff --git a/Crypto/src/DES3.c b/src/Crypto/src/DES3.c
similarity index 100%
rename from Crypto/src/DES3.c
rename to src/Crypto/src/DES3.c
diff --git a/Crypto/src/MD2.c b/src/Crypto/src/MD2.c
similarity index 100%
rename from Crypto/src/MD2.c
rename to src/Crypto/src/MD2.c
diff --git a/Crypto/src/MD4.c b/src/Crypto/src/MD4.c
similarity index 100%
rename from Crypto/src/MD4.c
rename to src/Crypto/src/MD4.c
diff --git a/Crypto/src/SHA256.c b/src/Crypto/src/SHA256.c
similarity index 100%
rename from Crypto/src/SHA256.c
rename to src/Crypto/src/SHA256.c
diff --git a/Crypto/src/XOR.c b/src/Crypto/src/XOR.c
similarity index 100%
rename from Crypto/src/XOR.c
rename to src/Crypto/src/XOR.c
diff --git a/Crypto/src/_dsa.c b/src/Crypto/src/_dsa.c
similarity index 100%
rename from Crypto/src/_dsa.c
rename to src/Crypto/src/_dsa.c
diff --git a/Crypto/src/_fastmath.c b/src/Crypto/src/_fastmath.c
similarity index 100%
rename from Crypto/src/_fastmath.c
rename to src/Crypto/src/_fastmath.c
diff --git a/Crypto/src/_rsa.c b/src/Crypto/src/_rsa.c
similarity index 100%
rename from Crypto/src/_rsa.c
rename to src/Crypto/src/_rsa.c
diff --git a/Crypto/src/block_template.c b/src/Crypto/src/block_template.c
similarity index 99%
rename from Crypto/src/block_template.c
rename to src/Crypto/src/block_template.c
index 37aa0453..3c9f4e9f 100644
--- a/Crypto/src/block_template.c
+++ b/src/Crypto/src/block_template.c
@@ -732,7 +732,7 @@ _MODULE_NAME (void)
 	ALGtype.ob_type = &PyType_Type;
 
 	/* Create the module and add the functions */
-	m = Py_InitModule("Crypto.Cipher." _MODULE_STRING, modulemethods);
+	m = Py_InitModule("allmydata.Crypto.Cipher." _MODULE_STRING, modulemethods);
 
 	PyModule_AddIntConstant(m, "MODE_ECB", MODE_ECB);
 	PyModule_AddIntConstant(m, "MODE_CBC", MODE_CBC);
diff --git a/Crypto/src/cast5.c b/src/Crypto/src/cast5.c
similarity index 100%
rename from Crypto/src/cast5.c
rename to src/Crypto/src/cast5.c
diff --git a/Crypto/src/hash_template.c b/src/Crypto/src/hash_template.c
similarity index 98%
rename from Crypto/src/hash_template.c
rename to src/Crypto/src/hash_template.c
index 6662dd54..2325b0fb 100644
--- a/Crypto/src/hash_template.c
+++ b/src/Crypto/src/hash_template.c
@@ -236,7 +236,7 @@ _MODULE_NAME (void)
 	PyObject *m;
 
 	ALGtype.ob_type = &PyType_Type;
-	m = Py_InitModule("Crypto.Hash." _MODULE_STRING, ALG_functions);
+	m = Py_InitModule("allmydata.Crypto.Hash." _MODULE_STRING, ALG_functions);
 
 	/* Add some symbolic constants to the module */
 	PyModule_AddIntConstant(m, "digest_size", DIGEST_SIZE);
diff --git a/Crypto/src/stream_template.c b/src/Crypto/src/stream_template.c
similarity index 98%
rename from Crypto/src/stream_template.c
rename to src/Crypto/src/stream_template.c
index 71d125c1..c3b32ecb 100644
--- a/Crypto/src/stream_template.c
+++ b/src/Crypto/src/stream_template.c
@@ -232,7 +232,7 @@ _MODULE_NAME (void)
 
 	ALGtype.ob_type = &PyType_Type;
 	/* Create the module and add the functions */
-	m = Py_InitModule("Crypto.Cipher." _MODULE_STRING, modulemethods);
+	m = Py_InitModule("allmydata.Crypto.Cipher." _MODULE_STRING, modulemethods);
 
 	/* Add some symbolic constants to the module */
 	d = PyModule_GetDict(m);
diff --git a/Crypto/src/winrand.c b/src/Crypto/src/winrand.c
similarity index 100%
rename from Crypto/src/winrand.c
rename to src/Crypto/src/winrand.c
diff --git a/Crypto/test.py b/src/Crypto/test.py
similarity index 100%
rename from Crypto/test.py
rename to src/Crypto/test.py
diff --git a/Crypto/test/template b/src/Crypto/test/template
similarity index 100%
rename from Crypto/test/template
rename to src/Crypto/test/template
diff --git a/Crypto/test/test_chaffing.py b/src/Crypto/test/test_chaffing.py
similarity index 100%
rename from Crypto/test/test_chaffing.py
rename to src/Crypto/test/test_chaffing.py
diff --git a/Crypto/test/test_hashes.py b/src/Crypto/test/test_hashes.py
similarity index 100%
rename from Crypto/test/test_hashes.py
rename to src/Crypto/test/test_hashes.py
diff --git a/Crypto/test/test_number.py b/src/Crypto/test/test_number.py
similarity index 100%
rename from Crypto/test/test_number.py
rename to src/Crypto/test/test_number.py
diff --git a/Crypto/test/test_publickey.py b/src/Crypto/test/test_publickey.py
similarity index 100%
rename from Crypto/test/test_publickey.py
rename to src/Crypto/test/test_publickey.py
diff --git a/Crypto/test/test_randpool.py b/src/Crypto/test/test_randpool.py
similarity index 100%
rename from Crypto/test/test_randpool.py
rename to src/Crypto/test/test_randpool.py
diff --git a/Crypto/test/test_rfc1751.py b/src/Crypto/test/test_rfc1751.py
similarity index 100%
rename from Crypto/test/test_rfc1751.py
rename to src/Crypto/test/test_rfc1751.py
diff --git a/Crypto/test/testdata.py b/src/Crypto/test/testdata.py
similarity index 100%
rename from Crypto/test/testdata.py
rename to src/Crypto/test/testdata.py
diff --git a/allmydata/__init__.py b/src/allmydata/__init__.py
similarity index 100%
rename from allmydata/__init__.py
rename to src/allmydata/__init__.py
diff --git a/allmydata/bucketstore.py b/src/allmydata/bucketstore.py
similarity index 100%
rename from allmydata/bucketstore.py
rename to src/allmydata/bucketstore.py
diff --git a/allmydata/chunk.py b/src/allmydata/chunk.py
similarity index 100%
rename from allmydata/chunk.py
rename to src/allmydata/chunk.py
diff --git a/allmydata/client.py b/src/allmydata/client.py
similarity index 100%
rename from allmydata/client.py
rename to src/allmydata/client.py
diff --git a/allmydata/debugshell.py b/src/allmydata/debugshell.py
similarity index 100%
rename from allmydata/debugshell.py
rename to src/allmydata/debugshell.py
diff --git a/allmydata/download.py b/src/allmydata/download.py
similarity index 100%
rename from allmydata/download.py
rename to src/allmydata/download.py
diff --git a/allmydata/encode.py b/src/allmydata/encode.py
similarity index 100%
rename from allmydata/encode.py
rename to src/allmydata/encode.py
diff --git a/allmydata/encode_new.py b/src/allmydata/encode_new.py
similarity index 100%
rename from allmydata/encode_new.py
rename to src/allmydata/encode_new.py
diff --git a/allmydata/filetable.py b/src/allmydata/filetable.py
similarity index 100%
rename from allmydata/filetable.py
rename to src/allmydata/filetable.py
diff --git a/allmydata/interfaces.py b/src/allmydata/interfaces.py
similarity index 100%
rename from allmydata/interfaces.py
rename to src/allmydata/interfaces.py
diff --git a/allmydata/manhole.py b/src/allmydata/manhole.py
similarity index 100%
rename from allmydata/manhole.py
rename to src/allmydata/manhole.py
diff --git a/allmydata/node.py b/src/allmydata/node.py
similarity index 100%
rename from allmydata/node.py
rename to src/allmydata/node.py
diff --git a/allmydata/queen.py b/src/allmydata/queen.py
similarity index 100%
rename from allmydata/queen.py
rename to src/allmydata/queen.py
diff --git a/allmydata/scripts/__init__.py b/src/allmydata/scripts/__init__.py
similarity index 100%
rename from allmydata/scripts/__init__.py
rename to src/allmydata/scripts/__init__.py
diff --git a/allmydata/scripts/runner.py b/src/allmydata/scripts/runner.py
similarity index 100%
rename from allmydata/scripts/runner.py
rename to src/allmydata/scripts/runner.py
diff --git a/allmydata/storageserver.py b/src/allmydata/storageserver.py
similarity index 100%
rename from allmydata/storageserver.py
rename to src/allmydata/storageserver.py
diff --git a/allmydata/test/__init__.py b/src/allmydata/test/__init__.py
similarity index 100%
rename from allmydata/test/__init__.py
rename to src/allmydata/test/__init__.py
diff --git a/allmydata/test/figleaf.excludes b/src/allmydata/test/figleaf.excludes
similarity index 100%
rename from allmydata/test/figleaf.excludes
rename to src/allmydata/test/figleaf.excludes
diff --git a/allmydata/test/test_client.py b/src/allmydata/test/test_client.py
similarity index 100%
rename from allmydata/test/test_client.py
rename to src/allmydata/test/test_client.py
diff --git a/allmydata/test/test_encode.py b/src/allmydata/test/test_encode.py
similarity index 100%
rename from allmydata/test/test_encode.py
rename to src/allmydata/test/test_encode.py
diff --git a/allmydata/test/test_filetable.py b/src/allmydata/test/test_filetable.py
similarity index 100%
rename from allmydata/test/test_filetable.py
rename to src/allmydata/test/test_filetable.py
diff --git a/allmydata/test/test_queen.py b/src/allmydata/test/test_queen.py
similarity index 100%
rename from allmydata/test/test_queen.py
rename to src/allmydata/test/test_queen.py
diff --git a/allmydata/test/test_storage.py b/src/allmydata/test/test_storage.py
similarity index 100%
rename from allmydata/test/test_storage.py
rename to src/allmydata/test/test_storage.py
diff --git a/allmydata/test/test_system.py b/src/allmydata/test/test_system.py
similarity index 100%
rename from allmydata/test/test_system.py
rename to src/allmydata/test/test_system.py
diff --git a/allmydata/test/test_upload.py b/src/allmydata/test/test_upload.py
similarity index 100%
rename from allmydata/test/test_upload.py
rename to src/allmydata/test/test_upload.py
diff --git a/allmydata/test/test_vdrive.py b/src/allmydata/test/test_vdrive.py
similarity index 100%
rename from allmydata/test/test_vdrive.py
rename to src/allmydata/test/test_vdrive.py
diff --git a/allmydata/test/trial_figleaf.py b/src/allmydata/test/trial_figleaf.py
similarity index 100%
rename from allmydata/test/trial_figleaf.py
rename to src/allmydata/test/trial_figleaf.py
diff --git a/allmydata/upload.py b/src/allmydata/upload.py
similarity index 100%
rename from allmydata/upload.py
rename to src/allmydata/upload.py
diff --git a/allmydata/util/__init__.py b/src/allmydata/util/__init__.py
similarity index 100%
rename from allmydata/util/__init__.py
rename to src/allmydata/util/__init__.py
diff --git a/allmydata/util/assertutil.py b/src/allmydata/util/assertutil.py
similarity index 100%
rename from allmydata/util/assertutil.py
rename to src/allmydata/util/assertutil.py
diff --git a/allmydata/util/bencode.py b/src/allmydata/util/bencode.py
similarity index 100%
rename from allmydata/util/bencode.py
rename to src/allmydata/util/bencode.py
diff --git a/allmydata/util/humanreadable.py b/src/allmydata/util/humanreadable.py
similarity index 100%
rename from allmydata/util/humanreadable.py
rename to src/allmydata/util/humanreadable.py
diff --git a/allmydata/util/idlib.py b/src/allmydata/util/idlib.py
similarity index 100%
rename from allmydata/util/idlib.py
rename to src/allmydata/util/idlib.py
diff --git a/allmydata/util/iputil.py b/src/allmydata/util/iputil.py
similarity index 100%
rename from allmydata/util/iputil.py
rename to src/allmydata/util/iputil.py
diff --git a/allmydata/vdrive.py b/src/allmydata/vdrive.py
similarity index 100%
rename from allmydata/vdrive.py
rename to src/allmydata/vdrive.py
diff --git a/allmydata/web/directory.xhtml b/src/allmydata/web/directory.xhtml
similarity index 100%
rename from allmydata/web/directory.xhtml
rename to src/allmydata/web/directory.xhtml
diff --git a/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml
similarity index 100%
rename from allmydata/web/welcome.xhtml
rename to src/allmydata/web/welcome.xhtml
diff --git a/allmydata/webish.py b/src/allmydata/webish.py
similarity index 100%
rename from allmydata/webish.py
rename to src/allmydata/webish.py
-- 
2.45.2