Browse Source

Merge commit '4df6a16233033cdb801659a1e80d1550aa1ef607'

pull/38/head
Krista Bennett 9 months ago
parent
commit
971ccb41eb
4 changed files with 5 additions and 5 deletions
  1. +1
    -2
      DEPENDENCIES
  2. +1
    -1
      scripts/debian10/Makefile
  3. +2
    -1
      scripts/debian10/pEpEngine.debian10.Dockerfile
  4. +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
scripts/debian10/Makefile View File

@ -1,8 +1,8 @@
include ../../DEPENDENCIES
export
PEP_MACHINE_DIR= $(PKG_INSTALL_PATH)/share/pEp
SEQUOIA_VERSION=${sequoia}
YML2_VERSION=${yml2}
SEQUOIA_VERSION=$(shell echo ${sequoia} | sed 's/\//-/')
CURRENT_DISTRO=$(shell basename $(shell pwd))
IMAGE_NAME=${DOCKER_REGISTRY_HOST}/pep-$(CURRENT_DISTRO)-engine
DOCKERFILE=pEpEngine.$(CURRENT_DISTRO).Dockerfile


+ 2
- 1
scripts/debian10/pEpEngine.debian10.Dockerfile View File

@ -1,7 +1,8 @@
ARG DOCKER_REGISTRY_HOST
ARG CURRENT_DISTRO
ARG PEPENGINE_VERSION
FROM ${DOCKER_REGISTRY_HOST}/pep-${CURRENT_DISTRO}-sequoia:latest
ARG SEQUOIA_VERSION
FROM ${DOCKER_REGISTRY_HOST}/pep-${CURRENT_DISTRO}-sequoia:${SEQUOIA_VERSION}
ENV BUILDROOT /build
ENV INSTPREFIX /install


+ 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