Glindeb · Glindeb · Jul 26, 2022 · Jul 23, 2022 · Jul 24, 2022 · Jul 24, 2022
diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml
@@ -0,0 +1,90 @@
+# This workflow will upload a Python Package using Twine when a push or pull-request pushed thru to the core branch.
+
+name: Core Build & Publish
+
+on:
+  merge:
+    branches: [core]
+  push:
+    branches: [core]
+
+permissions:
+  contents: read
+
+jobs:
+  validate:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ['3.9', '3.10']
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up python ${{ matrix.python-version }}
+        uses: actions/setup-python@v3
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install dependencies
+        run:
+          python -m pip install --upgrade pip
+          pip install tox tox-gh-actions
+      - name: Test
+        run: tox
+
+  build:
+    needs:
+      - validate
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: '3.x'
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install build
+      - name: Building package
+        run: python -m build
+
+  release:
+    needs:
+      - build
+      - validate
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: '3.x'
+      - name: Create release
+        uses: 'marvinpinto/action-automatic-releases@latest'
+        with:
+          repo_token: ${{ secrets.RELEASE_TOKEN }}
+          automatic_release_tag: $(python setup.py --version)
+          prerelease: false
+          title: $(python setup.py --version)
+          files: |
+            dist/*
+
+  deploy:
+    needs:
+      - release
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: '3.x'
+      - name: Publish package
+        uses: pypa/gh-action-pypi-publish@27b31702a0e7fc50959f5ad993c78deac1bdfc29
+        with:
+          user: __token__
+          password: ${{ secrets.PYPI_API_TOKEN }}
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,8 +1,13 @@
-name: Tests
+name: Test
 
 on:
-  - push
-  - pull_request
+  push:
+    branches: [dev]
+  pull_request:
+    branches: [core]
+
+permissions:
+  contents: read
 
 jobs:
   test:

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # AES-Python
 
-![Tests](https://github.com/Circut-labs/AES-Python/actions/workflows/test.yml/badge.svg) [![Build & Upload Python Package](https://github.com/Circut-labs/AES-Python/actions/workflows/python-publish.yml/badge.svg)](https://github.com/Circut-labs/AES-Python/actions/workflows/python-publish.yml)
+![Tests](https://github.com/Circut-labs/AES-Python/actions/workflows/test.yml/badge.svg) [![CodeQL](https://github.com/Circut-labs/AES-Python/actions/workflows/codeql-analysis.yml/badge.svg?branch=core)](https://github.com/Circut-labs/AES-Python/actions/workflows/codeql-analysis.yml) [![Build & Upload Python Package](https://github.com/Circut-labs/AES-Python/actions/workflows/python-publish.yml/badge.svg)](https://github.com/Circut-labs/AES-Python/actions/workflows/python-publish.yml)
 
 - [AES-Python](#aes-python)
   - [About](#about)
@@ -19,6 +19,7 @@ Implemented running modes
 ---
 - [x] **ECB** - Electronic Code Book mode (For more information see ...)
 - [x] **CBC** - Cipher Block Chaining mode (For more information see ...)
+- [x] **PCBC** - Propagating Cipher Block Chaining mode (For more information see ...)
 - [ ] **CFB** - Cipher Feedback mode (For more information see ...)
 - [ ] **OFB** - Output FeedBack mode (For more information see ...)
 - [ ] **CTR** - Counter mode (For more information see ...)

diff --git a/dist/AES-Python-1.0.0.tar.gz b/dist/AES-Python-1.0.0.tar.gz
diff --git a/dist/AES-Python-1.1.0.tar.gz b/dist/AES-Python-1.1.0.tar.gz
diff --git a/dist/AES_Python-1.0.0-py3-none-any.whl b/dist/AES_Python-1.0.0-py3-none-any.whl
diff --git a/dist/AES_Python-1.1.0-py3-none-any.whl b/dist/AES_Python-1.1.0-py3-none-any.whl
diff --git a/index.md b/index.md
@@ -0,0 +1,19 @@
+# AES-Python
+
+![Tests](https://github.com/Circut-labs/AES-Python/actions/workflows/test.yml/badge.svg) [![CodeQL](https://github.com/Circut-labs/AES-Python/actions/workflows/codeql-analysis.yml/badge.svg?branch=core)](https://github.com/Circut-labs/AES-Python/actions/workflows/codeql-analysis.yml) [![Build & Upload Python Package](https://github.com/Circut-labs/AES-Python/actions/workflows/python-publish.yml/badge.svg)](https://github.com/Circut-labs/AES-Python/actions/workflows/python-publish.yml)
+
+- [AES-Python](#aes-python)
+  - [Installation](#installation)
+  - [Usage](#usage)
+
+Installation
+---
+```
+pip install aes-python
+```
+
+Usage
+---
+```
+AES_Python
+```
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,16 +1,19 @@
 [build-system]
-requires = ["setuptools>=42.0", "wheel"]
+requires = ["setuptools>=63.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "AES-Python"
-version = "1.0.2"
+dynamic = ["version"]
 description = "AES (Advanced Encryption Standard) implementation in Python-3"
-readme = "README.md"
-authors = [{ name = "Gabriel Lindeblad", email = "Gabriel.Lindeblad@icloud.com" }]
-license = { file = "LICENSE" }
+readme = "index.md"
+authors = [{name = "Gabriel Lindeblad <Gabriel.Lindeblad@icloud.com>"}]
+license = {text = "MIT License (MIT)"}
 classifiers = [
+    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
+    "Environment :: Console",
+    "Topic :: Education",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
     "Programming Language :: Python :: 3.9",
@@ -19,11 +22,16 @@ classifiers = [
 keywords = ["AES", "AES_Python", "AES-Python", "Advanced Encryption Standard", "encryption", "cryptography"]
 requires-python = ">=3.7"
 
+[tools.setuptools.dynamic]
+version = {attr = "AES_Python.__version__"}
+
 [project.optional-dependencies]
 dev = ["pytest", "pytest-cov", "mypy", "flake8", "tox"]
 
 [project.urls]
 Homepage = "https://github.com/Circut-labs/AES-Python"
+Repository = "https://github.com/Circut-labs/AES-Python"
+Documentation = "https://github.com/Circut-labs/AES-Python"
 
 [project.scripts]
 AES_Python = "AES_Python.__main__:main"

diff --git a/setup.cfg b/setup.cfg
@@ -1,3 +1,6 @@
+[metadata]
+version = attr: AES_Python.__version__
+
 [options.package_data]
 AES_Python = py.typed
 

diff --git a/src/AES_Python.egg-info/PKG-INFO b/src/AES_Python.egg-info/PKG-INFO
@@ -1,33 +1,17 @@
 Metadata-Version: 2.1
 Name: AES-Python
-Version: 1.0.0
+Version: 1.1.0
 Summary: AES (Advanced Encryption Standard) implementation in Python-3
-Author-email: Gabriel Lindeblad <Gabriel.Lindeblad@icloud.com>
-License: MIT License
-
-        Copyright (c) 2022 Circut Labs
-
-        Permission is hereby granted, free of charge, to any person obtaining a copy
-        of this software and associated documentation files (the "Software"), to deal
-        in the Software without restriction, including without limitation the rights
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-        copies of the Software, and to permit persons to whom the Software is
-        furnished to do so, subject to the following conditions:
-
-        The above copyright notice and this permission notice shall be included in all
-        copies or substantial portions of the Software.
-
-        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-        SOFTWARE.
-
+Author: Gabriel Lindeblad <Gabriel.Lindeblad@icloud.com>
+License: MIT License (MIT)
 Project-URL: Homepage, https://github.com/Circut-labs/AES-Python
+Project-URL: Repository, https://github.com/Circut-labs/AES-Python
+Project-URL: Documentation, https://github.com/Circut-labs/AES-Python
 Keywords: AES,AES_Python,AES-Python,Advanced Encryption Standard,encryption,cryptography
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
+Classifier: Environment :: Console
+Classifier: Topic :: Education
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.9
@@ -39,28 +23,20 @@ License-File: LICENSE
 
 # AES-Python
 
-![Tests](https://github.com/Circut-labs/AES-Python/actions/workflows/test.yml/badge.svg)
+![Tests](https://github.com/Circut-labs/AES-Python/actions/workflows/test.yml/badge.svg) [![CodeQL](https://github.com/Circut-labs/AES-Python/actions/workflows/codeql-analysis.yml/badge.svg?branch=core)](https://github.com/Circut-labs/AES-Python/actions/workflows/codeql-analysis.yml) [![Build & Upload Python Package](https://github.com/Circut-labs/AES-Python/actions/workflows/python-publish.yml/badge.svg)](https://github.com/Circut-labs/AES-Python/actions/workflows/python-publish.yml)
 
 - [AES-Python](#aes-python)
-  - [About](#about)
-  - [Implemented running modes](#implemented-running-modes)
-  - [More information](#more-information)
+  - [Installation](#installation)
+  - [Usage](#usage)
 
-About
+Installation
 ---
-This project is a way for me to structure and work on my gymnasium project where i implement the AES encryption algorithm in python to the evaluate it and write a report about it. This project is written in pure python and do not use any external libraries for the core module "AES_Module". The project and the code is not intended for any use outside of educational and no security can be guaranteed for any encryption and/or decryption that uses this implementation. Do also not that this is not going to be the most efficient implementation due to my limited coding skills and knowledge, but i have tried to do my best to make it as efficient as possible so it´s not to slow to work with.
+```
+pip install aes-python
+```
 
-This implementation of AES (Advanced Encryption Algorithm) algorithm is implemented with a number of different running modes such as ECB and CBC with more coming soon (see list below for updated information)...
-
-Implemented running modes
----
-- [x] **ECB** - Electronic Code Book mode (For more information see ...)
-- [x] **CBC** - Cipher Block Chaining mode (For more information see ...)
-- [ ] **CFB** - Cipher Feedback mode (For more information see ...)
-- [ ] **OFB** - Output FeedBack mode (For more information see ...)
-- [ ] **CTR** - Counter mode (For more information see ...)
-- [ ] **GCM** - Galois/Counter mode (For more information see ...)
-
-More information
+Usage
 ---
-...
+```
+AES_Python
+```