Support cryptography 3.3 (#882)

* Re-add Debian Bullseye to CI.

* Support cryptography 3.3 as well.

tests/integration/targets/acme_account/tasks/main.yml

@@ -37,4 +37,4 @@
 
     - import_tasks: ../tests/validate.yml
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/acme_account_info/tasks/main.yml

@@ -37,4 +37,4 @@
 
     - import_tasks: ../tests/validate.yml
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/acme_ari_info/tasks/main.yml

@@ -41,4 +41,4 @@
 
         - import_tasks: ../tests/validate.yml
 
-      when: cryptography_version.stdout is version('3.4', '>=')
+      when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/acme_certificate/tasks/main.yml

@@ -118,4 +118,4 @@
 
     - import_tasks: ../tests/validate.yml
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/acme_certificate_deactivate_authz/tasks/main.yml

@@ -37,4 +37,4 @@
 
     - import_tasks: ../tests/validate.yml
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/acme_certificate_order/tasks/main.yml

@@ -33,4 +33,4 @@
       vars:
         select_crypto_backend: cryptography
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/acme_certificate_renewal_info/tasks/main.yml

@@ -40,4 +40,4 @@
 
         - import_tasks: ../tests/validate.yml
 
-      when: cryptography_version.stdout is version('3.4', '>=')
+      when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/acme_certificate_revoke/tasks/main.yml

@@ -37,4 +37,4 @@
 
     - import_tasks: ../tests/validate.yml
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/acme_challenge_cert_helper/tasks/main.yml

@@ -35,4 +35,4 @@
         terms_agreed: true
         account_email: "example@example.org"
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/acme_inspect/tasks/main.yml

@@ -37,4 +37,4 @@
 
     - import_tasks: ../tests/validate.yml
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/certificate_complete_chain/tasks/main.yml

@@ -24,4 +24,4 @@
     - name: Run tests with created certificates
       import_tasks: created.yml
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/filter_openssl_csr_info/tasks/main.yml

@@ -129,4 +129,4 @@
 
 - name: Running tests
   include_tasks: impl.yml
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/filter_openssl_privatekey_info/tasks/main.yml

@@ -39,4 +39,4 @@
 
 - name: Running tests
   include_tasks: impl.yml
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/filter_openssl_publickey_info/tasks/main.yml

@@ -44,4 +44,4 @@
 
 - name: Running tests
   include_tasks: impl.yml
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/filter_x509_certificate_info/tasks/main.yml

@@ -146,4 +146,4 @@
 
 - name: Running tests
   include_tasks: impl.yml
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/filter_x509_crl_info/tasks/main.yml

@@ -88,4 +88,4 @@
     - name: Running tests
       include_tasks: impl.yml
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/get_certificate/tasks/main.yml

@@ -37,7 +37,7 @@
         that:
           - result is success or skip_tests
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')
 
 - block:
 

tests/integration/targets/openssh_keypair/tasks/main.yml

@@ -19,7 +19,7 @@
 
 - set_fact:
     backends: "{{ backends + ['cryptography'] }}"
-  when: cryptography_version.stdout is version('3.4', '>=') and bcrypt_version.stdout is version('3.1.5', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=') and bcrypt_version.stdout is version('3.1.5', '>=')
 
 - include_tasks: ../tests/core.yml
   loop: "{{ backends }}"
@@ -47,4 +47,4 @@
     loop_var: backend
 
 - include_tasks: ../tests/cryptography_backend.yml
-  when: cryptography_version.stdout is version('3.4', '>=') and bcrypt_version.stdout is version('3.1.5', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=') and bcrypt_version.stdout is version('3.1.5', '>=')

tests/integration/targets/openssl_csr/tasks/main.yml

@@ -29,4 +29,4 @@
       vars:
         select_crypto_backend: cryptography
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/openssl_csr_info/tasks/main.yml

@@ -132,4 +132,4 @@
   include_tasks: impl.yml
   vars:
     select_crypto_backend: cryptography
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/openssl_csr_pipe/tasks/main.yml

@@ -24,4 +24,4 @@
       vars:
         select_crypto_backend: cryptography
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/openssl_dhparam/tasks/main.yml

@@ -44,4 +44,4 @@
 
   vars:
     select_crypto_backend: cryptography
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/openssl_pkcs12/tasks/main.yml

@@ -62,13 +62,10 @@
         path: '{{ remote_tmp_dir }}/ansible.p12'
         state: absent
 
-    - block:
-        - name: Running tests with cryptography backend
-          include_tasks: impl.yml
-          vars:
-            select_crypto_backend: cryptography
-
-      when: cryptography_version.stdout is version('3.4', '>=')
+    - name: Running tests with cryptography backend
+      include_tasks: impl.yml
+      vars:
+        select_crypto_backend: cryptography
 
   when: >-
-    cryptography_version.stdout is version('3.4', '>=')
+    cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/openssl_privatekey/tasks/main.yml

@@ -50,4 +50,4 @@
       vars:
         select_crypto_backend: cryptography
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/openssl_privatekey_convert/tasks/main.yml

@@ -58,4 +58,4 @@
       vars:
         select_crypto_backend: cryptography
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/openssl_privatekey_info/tasks/main.yml

@@ -43,4 +43,4 @@
   include_tasks: impl.yml
   vars:
     select_crypto_backend: cryptography
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/openssl_privatekey_pipe/tasks/main.yml

@@ -18,4 +18,4 @@
       vars:
         select_crypto_backend: cryptography
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/openssl_publickey/tasks/main.yml

@@ -28,4 +28,4 @@
       vars:
         select_crypto_backend: cryptography
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/openssl_publickey_info/tasks/main.yml

@@ -46,4 +46,4 @@
   include_tasks: impl.yml
   vars:
     select_crypto_backend: cryptography
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/x509_certificate-acme/tasks/main.yml

@@ -141,4 +141,4 @@
 - name: Running tests
   include_tasks: impl.yml
   # Make x509_certificate module happy
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/x509_certificate/tasks/main.yml

@@ -12,4 +12,4 @@
   include_tasks: impl.yml
   vars:
     select_crypto_backend: cryptography
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/x509_certificate/tasks/ownca.yml

@@ -658,6 +658,6 @@
           register: ownca_certificate_ed25519_ed448_2_idempotence
           ignore_errors: true
 
-  when: select_crypto_backend == 'cryptography' and cryptography_version.stdout is version('3.4', '>=')
+  when: select_crypto_backend == 'cryptography' and cryptography_version.stdout is version('3.3', '>=')
 
 - import_tasks: ../tests/validate_ownca.yml

tests/integration/targets/x509_certificate/tasks/selfsigned.yml

@@ -480,6 +480,6 @@
           register: selfsigned_certificate_ed25519_ed448_idempotence
           ignore_errors: true
 
-  when: select_crypto_backend == 'cryptography' and cryptography_version.stdout is version('3.4', '>=')
+  when: select_crypto_backend == 'cryptography' and cryptography_version.stdout is version('3.3', '>=')
 
 - import_tasks: ../tests/validate_selfsigned.yml

tests/integration/targets/x509_certificate_info/tasks/main.yml

@@ -149,4 +149,4 @@
   include_tasks: impl.yml
   vars:
     select_crypto_backend: cryptography
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/x509_certificate_pipe/tasks/main.yml

@@ -23,4 +23,4 @@
       vars:
         select_crypto_backend: cryptography
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/x509_crl/tasks/impl.yml

@@ -694,4 +694,4 @@
             - Ed448
           ignore_errors: true
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')

tests/integration/targets/x509_crl/tasks/main.yml

@@ -90,4 +90,4 @@
 
     - import_tasks: ../tests/validate.yml
 
-  when: cryptography_version.stdout is version('3.4', '>=')
+  when: cryptography_version.stdout is version('3.3', '>=')