diff --git a/.gitignore b/.gitignore index 52eca59fb..b22328702 100644 --- a/.gitignore +++ b/.gitignore @@ -186,3 +186,6 @@ wolfcrypt/user-crypto/lib/libusercrypto.* # wolfSSL CSharp wrapper wrapper/CSharp/x64/ + +# Visual Studio Code Workspace Files +*.vscode \ No newline at end of file diff --git a/wrapper/include.am b/wrapper/include.am index 56b63fec4..18ec1bcd2 100644 --- a/wrapper/include.am +++ b/wrapper/include.am @@ -30,29 +30,29 @@ EXTRA_DIST+= wrapper/CSharp/wolfSSL_CSharp/wolfSSL.cs EXTRA_DIST+= wrapper/CSharp/wolfSSL_CSharp/wolfSSL_CSharp.csproj # wolfcrypt python wrapper files -EXTRA_DIST+= wrapper/python/.gitignore -EXTRA_DIST+= wrapper/python/docs/asymmetric.rst -EXTRA_DIST+= wrapper/python/docs/conf.py -EXTRA_DIST+= wrapper/python/docs/digest.rst -EXTRA_DIST+= wrapper/python/docs/index.rst -EXTRA_DIST+= wrapper/python/docs/mac.rst -EXTRA_DIST+= wrapper/python/docs/Makefile -EXTRA_DIST+= wrapper/python/docs/random.rst -EXTRA_DIST+= wrapper/python/docs/symmetric.rst -EXTRA_DIST+= wrapper/python/LICENSING.rst -EXTRA_DIST+= wrapper/python/MANIFEST.in -EXTRA_DIST+= wrapper/python/README.rst -EXTRA_DIST+= wrapper/python/requirements-testing.txt -EXTRA_DIST+= wrapper/python/setup.py -EXTRA_DIST+= wrapper/python/test/test_ciphers.py -EXTRA_DIST+= wrapper/python/test/test_hashes.py -EXTRA_DIST+= wrapper/python/test/test_random.py -EXTRA_DIST+= wrapper/python/tox.ini -EXTRA_DIST+= wrapper/python/wolfcrypt/__about__.py -EXTRA_DIST+= wrapper/python/wolfcrypt/__init__.py -EXTRA_DIST+= wrapper/python/wolfcrypt/build_ffi.py -EXTRA_DIST+= wrapper/python/wolfcrypt/ciphers.py -EXTRA_DIST+= wrapper/python/wolfcrypt/exceptions.py -EXTRA_DIST+= wrapper/python/wolfcrypt/hashes.py -EXTRA_DIST+= wrapper/python/wolfcrypt/random.py -EXTRA_DIST+= wrapper/python/wolfcrypt/utils.py +EXTRA_DIST+= wrapper/python/wolfcrypt/.gitignore +EXTRA_DIST+= wrapper/python/wolfcrypt/docs/asymmetric.rst +EXTRA_DIST+= wrapper/python/wolfcrypt/docs/conf.py +EXTRA_DIST+= wrapper/python/wolfcrypt/docs/digest.rst +EXTRA_DIST+= wrapper/python/wolfcrypt/docs/index.rst +EXTRA_DIST+= wrapper/python/wolfcrypt/docs/mac.rst +EXTRA_DIST+= wrapper/python/wolfcrypt/docs/Makefile +EXTRA_DIST+= wrapper/python/wolfcrypt/docs/random.rst +EXTRA_DIST+= wrapper/python/wolfcrypt/docs/symmetric.rst +EXTRA_DIST+= wrapper/python/wolfcrypt/LICENSING.rst +EXTRA_DIST+= wrapper/python/wolfcrypt/MANIFEST.in +EXTRA_DIST+= wrapper/python/wolfcrypt/README.rst +EXTRA_DIST+= wrapper/python/wolfcrypt/requirements-testing.txt +EXTRA_DIST+= wrapper/python/wolfcrypt/setup.py +EXTRA_DIST+= wrapper/python/wolfcrypt/test/test_ciphers.py +EXTRA_DIST+= wrapper/python/wolfcrypt/test/test_hashes.py +EXTRA_DIST+= wrapper/python/wolfcrypt/test/test_random.py +EXTRA_DIST+= wrapper/python/wolfcrypt/tox.ini +EXTRA_DIST+= wrapper/python/wolfcrypt/wolfcrypt/__about__.py +EXTRA_DIST+= wrapper/python/wolfcrypt/wolfcrypt/__init__.py +EXTRA_DIST+= wrapper/python/wolfcrypt/wolfcrypt/build_ffi.py +EXTRA_DIST+= wrapper/python/wolfcrypt/wolfcrypt/ciphers.py +EXTRA_DIST+= wrapper/python/wolfcrypt/wolfcrypt/exceptions.py +EXTRA_DIST+= wrapper/python/wolfcrypt/wolfcrypt/hashes.py +EXTRA_DIST+= wrapper/python/wolfcrypt/wolfcrypt/random.py +EXTRA_DIST+= wrapper/python/wolfcrypt/wolfcrypt/utils.py diff --git a/wrapper/python/.centos-provisioner.sh b/wrapper/python/wolfcrypt/.centos-provisioner.sh similarity index 100% rename from wrapper/python/.centos-provisioner.sh rename to wrapper/python/wolfcrypt/.centos-provisioner.sh diff --git a/wrapper/python/.gitignore b/wrapper/python/wolfcrypt/.gitignore similarity index 100% rename from wrapper/python/.gitignore rename to wrapper/python/wolfcrypt/.gitignore diff --git a/wrapper/python/.ubuntu-provisioner.sh b/wrapper/python/wolfcrypt/.ubuntu-provisioner.sh similarity index 100% rename from wrapper/python/.ubuntu-provisioner.sh rename to wrapper/python/wolfcrypt/.ubuntu-provisioner.sh diff --git a/wrapper/python/LICENSING.rst b/wrapper/python/wolfcrypt/LICENSING.rst similarity index 100% rename from wrapper/python/LICENSING.rst rename to wrapper/python/wolfcrypt/LICENSING.rst diff --git a/wrapper/python/MANIFEST.in b/wrapper/python/wolfcrypt/MANIFEST.in similarity index 100% rename from wrapper/python/MANIFEST.in rename to wrapper/python/wolfcrypt/MANIFEST.in diff --git a/wrapper/python/README.rst b/wrapper/python/wolfcrypt/README.rst similarity index 97% rename from wrapper/python/README.rst rename to wrapper/python/wolfcrypt/README.rst index 87121192b..1732c906b 100644 --- a/wrapper/python/README.rst +++ b/wrapper/python/wolfcrypt/README.rst @@ -117,8 +117,8 @@ Testing ``wolfcrypt``'s source code with ``tox`` : ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ To run the unit tests in the source code, you'll need ``tox`` and a few other -requirements. The source code relies at 'WOLFSSL_DIR/wrapper/python' where -WOLFSSL_DIR is the path of ``wolfssl``'s source code. +requirements. The source code relies at 'WOLFSSL_DIR/wrapper/python/wolfcrypt' +where WOLFSSL_DIR is the path of ``wolfssl``'s source code. 1. Make sure that the testing requirements are installed: diff --git a/wrapper/python/Vagrantfile b/wrapper/python/wolfcrypt/Vagrantfile similarity index 100% rename from wrapper/python/Vagrantfile rename to wrapper/python/wolfcrypt/Vagrantfile diff --git a/wrapper/python/docs/Makefile b/wrapper/python/wolfcrypt/docs/Makefile similarity index 100% rename from wrapper/python/docs/Makefile rename to wrapper/python/wolfcrypt/docs/Makefile diff --git a/wrapper/python/docs/asymmetric.rst b/wrapper/python/wolfcrypt/docs/asymmetric.rst similarity index 100% rename from wrapper/python/docs/asymmetric.rst rename to wrapper/python/wolfcrypt/docs/asymmetric.rst diff --git a/wrapper/python/docs/conf.py b/wrapper/python/wolfcrypt/docs/conf.py similarity index 100% rename from wrapper/python/docs/conf.py rename to wrapper/python/wolfcrypt/docs/conf.py diff --git a/wrapper/python/docs/digest.rst b/wrapper/python/wolfcrypt/docs/digest.rst similarity index 100% rename from wrapper/python/docs/digest.rst rename to wrapper/python/wolfcrypt/docs/digest.rst diff --git a/wrapper/python/docs/index.rst b/wrapper/python/wolfcrypt/docs/index.rst similarity index 100% rename from wrapper/python/docs/index.rst rename to wrapper/python/wolfcrypt/docs/index.rst diff --git a/wrapper/python/docs/mac.rst b/wrapper/python/wolfcrypt/docs/mac.rst similarity index 100% rename from wrapper/python/docs/mac.rst rename to wrapper/python/wolfcrypt/docs/mac.rst diff --git a/wrapper/python/docs/random.rst b/wrapper/python/wolfcrypt/docs/random.rst similarity index 100% rename from wrapper/python/docs/random.rst rename to wrapper/python/wolfcrypt/docs/random.rst diff --git a/wrapper/python/docs/symmetric.rst b/wrapper/python/wolfcrypt/docs/symmetric.rst similarity index 100% rename from wrapper/python/docs/symmetric.rst rename to wrapper/python/wolfcrypt/docs/symmetric.rst diff --git a/wrapper/python/requirements-testing.txt b/wrapper/python/wolfcrypt/requirements-testing.txt similarity index 100% rename from wrapper/python/requirements-testing.txt rename to wrapper/python/wolfcrypt/requirements-testing.txt diff --git a/wrapper/python/setup.py b/wrapper/python/wolfcrypt/setup.py similarity index 100% rename from wrapper/python/setup.py rename to wrapper/python/wolfcrypt/setup.py diff --git a/wrapper/python/test/test_ciphers.py b/wrapper/python/wolfcrypt/test/test_ciphers.py similarity index 100% rename from wrapper/python/test/test_ciphers.py rename to wrapper/python/wolfcrypt/test/test_ciphers.py diff --git a/wrapper/python/test/test_hashes.py b/wrapper/python/wolfcrypt/test/test_hashes.py similarity index 100% rename from wrapper/python/test/test_hashes.py rename to wrapper/python/wolfcrypt/test/test_hashes.py diff --git a/wrapper/python/test/test_random.py b/wrapper/python/wolfcrypt/test/test_random.py similarity index 100% rename from wrapper/python/test/test_random.py rename to wrapper/python/wolfcrypt/test/test_random.py diff --git a/wrapper/python/tox.ini b/wrapper/python/wolfcrypt/tox.ini similarity index 100% rename from wrapper/python/tox.ini rename to wrapper/python/wolfcrypt/tox.ini diff --git a/wrapper/python/wolfcrypt/__about__.py b/wrapper/python/wolfcrypt/wolfcrypt/__about__.py similarity index 98% rename from wrapper/python/wolfcrypt/__about__.py rename to wrapper/python/wolfcrypt/wolfcrypt/__about__.py index b5c05386a..c0482dc17 100644 --- a/wrapper/python/wolfcrypt/__about__.py +++ b/wrapper/python/wolfcrypt/wolfcrypt/__about__.py @@ -20,7 +20,7 @@ metadata = dict( __name__ = "wolfcrypt", - __version__ = "0.1.8", + __version__ = "0.1.9", __license__ = "GPLv2 or Commercial License", __author__ = "wolfSSL Inc.", __author_email__ = "info@wolfssl.com", diff --git a/wrapper/python/wolfcrypt/__init__.py b/wrapper/python/wolfcrypt/wolfcrypt/__init__.py similarity index 100% rename from wrapper/python/wolfcrypt/__init__.py rename to wrapper/python/wolfcrypt/wolfcrypt/__init__.py diff --git a/wrapper/python/wolfcrypt/build_ffi.py b/wrapper/python/wolfcrypt/wolfcrypt/build_ffi.py similarity index 100% rename from wrapper/python/wolfcrypt/build_ffi.py rename to wrapper/python/wolfcrypt/wolfcrypt/build_ffi.py diff --git a/wrapper/python/wolfcrypt/ciphers.py b/wrapper/python/wolfcrypt/wolfcrypt/ciphers.py similarity index 100% rename from wrapper/python/wolfcrypt/ciphers.py rename to wrapper/python/wolfcrypt/wolfcrypt/ciphers.py diff --git a/wrapper/python/wolfcrypt/exceptions.py b/wrapper/python/wolfcrypt/wolfcrypt/exceptions.py similarity index 100% rename from wrapper/python/wolfcrypt/exceptions.py rename to wrapper/python/wolfcrypt/wolfcrypt/exceptions.py diff --git a/wrapper/python/wolfcrypt/hashes.py b/wrapper/python/wolfcrypt/wolfcrypt/hashes.py similarity index 100% rename from wrapper/python/wolfcrypt/hashes.py rename to wrapper/python/wolfcrypt/wolfcrypt/hashes.py diff --git a/wrapper/python/wolfcrypt/random.py b/wrapper/python/wolfcrypt/wolfcrypt/random.py similarity index 100% rename from wrapper/python/wolfcrypt/random.py rename to wrapper/python/wolfcrypt/wolfcrypt/random.py diff --git a/wrapper/python/wolfcrypt/utils.py b/wrapper/python/wolfcrypt/wolfcrypt/utils.py similarity index 100% rename from wrapper/python/wolfcrypt/utils.py rename to wrapper/python/wolfcrypt/wolfcrypt/utils.py