Merge branch 'main' into utcnow

Author: peppelinux

.github/workflows/codeql-analysis.yml

@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ develop ]
+    branches: [ main ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ develop ]
+    branches: [ main ]
   schedule:
     - cron: '22 14 * * 2'
 

.github/workflows/test.yml

@@ -5,15 +5,29 @@ on:
   - pull_request
 
 jobs:
+  pre_job:
+    runs-on: ubuntu-latest
+    outputs:
+      should_skip: ${{ steps.skip_check.outputs.should_skip }}
+    steps:
+      - id: skip_check
+        uses: fkirc/skip-duplicate-actions@master
+        with:
+          do_not_skip: '["pull_request"]'
+          cancel_others: 'true'
+          concurrent_skipping: same_content
   test:
+    needs: pre_job
+    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version:
-          - 3.6
-          - 3.7
-          - 3.8
-          - 3.9
+          - "3.6"
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
@@ -33,6 +47,8 @@ jobs:
         run: |
           pip install poetry
           poetry config virtualenvs.in-project true
+      - name: Python 3.10 workaround
+        run: poetry config experimental.new-installer false
       - name: Install dependencies
         run: poetry install
       - name: Run pytest

doc/jwe.rst

@@ -43,10 +43,10 @@ There is a lower level way of doing the same, it will look like this::
     >>> from cryptojwt.jwk.rsa import import_private_rsa_key_from_file
     >>> from cryptojwt.jwe.jwe_rsa import JWE_RSA
 
-    >>> priv_key = import_private_rsa_key_from_file(KEY)
+    >>> priv_key = import_private_rsa_key_from_file('certs/key.pem')
     >>> pub_key = priv_key.public_key()
     >>> plain = b'Now is the time for all good men to come to the aid of ...'
-    >>> _rsa = JWE_RSA(plain, alg="RSA1_5", enc="A128CBC-HS256")
+    >>> _rsa = JWE_RSA(plain, alg="RSA-OAEP", enc="A128CBC-HS256")
     >>> jwe = _rsa.encrypt(pub_key)
 
 Here the key is an cryptography.hazmat.primitives.asymmetric.rsa.RSAPrivateKey
@@ -61,7 +61,7 @@ Decrypting using the encrypted message above.
     >>> from cryptojwt.jwe.jwe import factory
     >>> from cryptojwt.jwk.rsa import RSAKey
 
-    >>> _decryptor = factory(jwe, alg="RSA1_5", enc="A128CBC-HS256")
+    >>> _decryptor = factory(jwe, alg="RSA-OAEP", enc="A128CBC-HS256")
     >>> _dkey = RSAKey(priv_key=priv_key)
     >>> msg = _decryptor.decrypt(jwe, [_dkey])