Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
8c9cfba6
Kaydet (Commit)
8c9cfba6
authored
Eki 19, 2017
tarafından
David Tardon
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fix build with system gpgme
Change-Id: I00e6d6ce476adbd22bcfb4eb55d4db4194f4bc92
üst
31aeb934
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
2 deletions
+25
-2
config_gpgme.h.in
config_host/config_gpgme.h.in
+16
-0
configure.ac
configure.ac
+2
-0
CertificateImpl.cxx
xmlsecurity/source/gpg/CertificateImpl.cxx
+7
-2
No files found.
config_host/config_gpgme.h.in
0 → 100644
Dosyayı görüntüle @
8c9cfba6
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
/* Configuration for gpgme++.
*/
// Defined if gpgme supports exporting minimal key.
#define GPGME_CAN_EXPORT_MINIMAL_KEY 0
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
configure.ac
Dosyayı görüntüle @
8c9cfba6
...
...
@@ -10242,6 +10242,7 @@ if test "$_os" = "Linux"; then
else
AC_MSG_RESULT([internal])
BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
AC_DEFINE([GPGME_CAN_EXPORT_MINIMAL_KEY])
GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src"
GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs -lgpg-error"
...
...
@@ -12353,6 +12354,7 @@ AC_CONFIG_HEADERS([config_host/config_firebird.h])
AC_CONFIG_HEADERS([config_host/config_folders.h])
AC_CONFIG_HEADERS([config_host/config_gio.h])
AC_CONFIG_HEADERS([config_host/config_global.h])
AC_CONFIG_HEADERS([config_host/config_gpgme.h])
AC_CONFIG_HEADERS([config_host/config_java.h])
AC_CONFIG_HEADERS([config_host/config_lgpl.h])
AC_CONFIG_HEADERS([config_host/config_libepubgen.h])
...
...
xmlsecurity/source/gpg/CertificateImpl.cxx
Dosyayı görüntüle @
8c9cfba6
...
...
@@ -7,6 +7,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <config_gpgme.h>
#include "CertificateImpl.hxx"
#include <comphelper/servicehelper.hxx>
...
...
@@ -215,8 +217,11 @@ void CertificateImpl::setCertificate(GpgME::Context* ctx, const GpgME::Key& key)
ctx
->
setArmor
(
false
);
// caller will base64-encode anyway
GpgME
::
Error
err
=
ctx
->
exportPublicKeys
(
key
.
primaryFingerprint
(),
data_out
,
officecfg
::
Office
::
Common
::
Security
::
OpenPGP
::
MinimalKeyExport
::
get
());
data_out
#if GPGME_CAN_EXPORT_MINIMAL_KEY
,
officecfg
::
Office
::
Common
::
Security
::
OpenPGP
::
MinimalKeyExport
::
get
()
#endif
);
if
(
err
)
throw
RuntimeException
(
"The GpgME library failed to retrieve the public key"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment