summaryrefslogtreecommitdiffstats
path: root/ipatests
diff options
context:
space:
mode:
authorChristian Heimes <cheimes@redhat.com>2017-02-25 11:06:04 +0100
committerMartin Basti <mbasti@redhat.com>2017-03-01 12:51:50 +0100
commit135d0b5dd111d40632e2cd5be8f5315684b45fc6 (patch)
treefebddf0f6f32904dc7d91487389dd7c0190e35d5 /ipatests
parentd00ae870dda2889545c9d93e82e44526bfd4f431 (diff)
downloadfreeipa-135d0b5dd111d40632e2cd5be8f5315684b45fc6.tar.gz
freeipa-135d0b5dd111d40632e2cd5be8f5315684b45fc6.tar.xz
freeipa-135d0b5dd111d40632e2cd5be8f5315684b45fc6.zip
Finish port to PyCA cryptography
* add missing default_backend * unpad encrypted data * use cryptography's hashes and HMAC construct * remove hard dependency on python-nss from setup.py Signed-off-by: Christian Heimes <cheimes@redhat.com> Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipatests')
-rw-r--r--ipatests/setup.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/ipatests/setup.py b/ipatests/setup.py
index e46e922fd..46d51ff1c 100644
--- a/ipatests/setup.py
+++ b/ipatests/setup.py
@@ -71,12 +71,11 @@ if __name__ == '__main__':
"pyldap",
"pytest",
"pytest_multihost",
- "python-nss",
"six",
],
extras_require={
"integration": ["dbus-python", "pyyaml", "ipaserver"],
- "ipaserver": ["ipaserver"],
+ "ipaserver": ["ipaserver", "python-nss"],
"webui": ["selenium", "pyyaml", "ipaserver"],
"xmlrpc": ["ipaserver"],
}