pass-secret-service: unstable-2022-03-21 -> unstable-2022-07-18
fixes the build. patch doesn't seem necessary any more as the mentioned PR has been merged.
This commit is contained in:
parent
85012c8d29
commit
101372127a
|
@ -12,21 +12,15 @@ python3.pkgs.buildPythonApplication rec {
|
||||||
# PyPI has old alpha version. Since then the project has switched from using a
|
# PyPI has old alpha version. Since then the project has switched from using a
|
||||||
# seemingly abandoned D-Bus package pydbus and started using maintained
|
# seemingly abandoned D-Bus package pydbus and started using maintained
|
||||||
# dbus-next. So let's use latest from GitHub.
|
# dbus-next. So let's use latest from GitHub.
|
||||||
version = "unstable-2022-03-21";
|
version = "unstable-2022-07-18";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "mdellweg";
|
owner = "mdellweg";
|
||||||
repo = "pass_secret_service";
|
repo = "pass_secret_service";
|
||||||
rev = "149f8557e07098eee2f46561eea61e83255ac59b";
|
rev = "fadc09be718ae1e507eeb8719f3a2ea23edb6d7a";
|
||||||
sha256 = "sha256-+/pFi6+K8rl0Ihm6cp/emUQVtau6+Apl8/VEr9AI0Xs=";
|
hash = "sha256-lrNU5bkG4/fMu5rDywfiI8vNHyBsMf/fiWIeEHug03c=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Only needed until https://github.com/mdellweg/pass_secret_service/pull/30
|
|
||||||
# is merged.
|
|
||||||
./int_from_bytes-deprecation-fix.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
# Need to specify session.conf file for tests because it won't be found under
|
# Need to specify session.conf file for tests because it won't be found under
|
||||||
# /etc/ in check phase.
|
# /etc/ in check phase.
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|
|
@ -1,22 +0,0 @@
|
||||||
--- a/pass_secret_service/interfaces/session.py
|
|
||||||
+++ b/pass_secret_service/interfaces/session.py
|
|
||||||
@@ -4,7 +4,6 @@
|
|
||||||
import os
|
|
||||||
import hmac
|
|
||||||
from hashlib import sha256
|
|
||||||
-from cryptography.utils import int_from_bytes
|
|
||||||
from cryptography.hazmat.backends import default_backend
|
|
||||||
from cryptography.hazmat.primitives.ciphers import Cipher
|
|
||||||
from cryptography.hazmat.primitives.ciphers.modes import CBC
|
|
||||||
@@ -27,9 +26,9 @@ class Session(ServiceInterface, SerialMixin):
|
|
||||||
@classmethod
|
|
||||||
@run_in_executor
|
|
||||||
def _create_dh(cls, input):
|
|
||||||
- priv_key = int_from_bytes(os.urandom(0x80), "big")
|
|
||||||
+ priv_key = int.from_bytes(os.urandom(0x80), "big")
|
|
||||||
pub_key = pow(2, priv_key, dh_prime)
|
|
||||||
- shared_secret = pow(int_from_bytes(input, "big"), priv_key, dh_prime)
|
|
||||||
+ shared_secret = pow(int.from_bytes(input, "big"), priv_key, dh_prime)
|
|
||||||
salt = b"\x00" * 0x20
|
|
||||||
shared_key = hmac.new(salt, shared_secret.to_bytes(0x80, "big"), sha256).digest()
|
|
||||||
aes_key = hmac.new(shared_key, b"\x01", sha256).digest()[:0x10]
|
|
Loading…
Reference in a new issue