A Guix channel providing pretty Easy privacy ( p≡p)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

26 lines
976 B

  1. From 16373d3fc811f3bb69c7d26084577ec9af6af094 Mon Sep 17 00:00:00 2001
  2. Message-Id: <16373d3fc811f3bb69c7d26084577ec9af6af094.1617181347.git.h.goebel@crazy-compilers.com>
  3. From: Hartmut Goebel <h.goebel@crazy-compilers.com>
  4. Date: Tue, 23 Mar 2021 17:52:01 +0100
  5. Subject: [PATCH] Fix pgp_sequoia for sequoia v1.0.0. DON'T PUSH
  6. ---
  7. src/pgp_sequoia.c | 2 +-
  8. 1 file changed, 1 insertion(+), 1 deletion(-)
  9. diff --git a/src/pgp_sequoia.c b/src/pgp_sequoia.c
  10. index b11d5784..7106204b 100644
  11. --- a/src/pgp_sequoia.c
  12. +++ b/src/pgp_sequoia.c
  13. @@ -1230,7 +1230,7 @@ static PEP_STATUS cert_save(PEP_SESSION session, pgp_cert_t cert,
  14. ERROR_OUT(NULL, status, "Could not serialize existing cert for change check");
  15. }
  16. - cert = pgp_cert_merge(&err, cert, current);
  17. + cert = pgp_cert_merge_public_and_secret(&err, cert, current);
  18. if (! cert)
  19. ERROR_OUT(err, PEP_UNKNOWN_ERROR, "Merging certificates");
  20. }
  21. --
  22. 2.21.4