Browse Source

Merge branch 'neal/sequoia-1.1' into dvn/sequoia-1.1

doxygen_doc
Devan Carpenter 7 months ago
parent
commit
4df6a16233
2 changed files with 2 additions and 3 deletions
  1. +1
    -2
      DEPENDENCIES
  2. +1
    -1
      src/pgp_sequoia.c

+ 1
- 2
DEPENDENCIES View File

@ -1,5 +1,4 @@
# 1st Party Dependencies
## Prefer git tags instead of SHA hashes when possible.
sequoia=365d00a08bec6a5a48d48a7c7893d78c27092b59
sequoia=openpgp/v1.1.0
yml2=2.7.0

+ 1
- 1
src/pgp_sequoia.c View File

@ -1230,7 +1230,7 @@ static PEP_STATUS cert_save(PEP_SESSION session, pgp_cert_t cert,
ERROR_OUT(NULL, status, "Could not serialize existing cert for change check");
}
cert = pgp_cert_merge(&err, cert, current);
cert = pgp_cert_merge_public_and_secret(&err, cert, current);
if (! cert)
ERROR_OUT(err, PEP_UNKNOWN_ERROR, "Merging certificates");
}


Loading…
Cancel
Save