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
efe9d1df
Kaydet (Commit)
efe9d1df
authored
Ara 21, 2016
tarafından
Tor Lillqvist
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Don't add empty TODO functions to libxmlsec, and don't call them
Change-Id: Iaec1de29a0e7f3ea8eb10869382401d121de2c8a
üst
6aca7389
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
68 deletions
+2
-68
xmlsec1-customkeymanage.patch.1
external/libxmlsec/xmlsec1-customkeymanage.patch.1
+2
-47
securityenvironment_mscryptimpl.cxx
...source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+0
-21
No files found.
external/libxmlsec/xmlsec1-customkeymanage.patch.1
Dosyayı görüntüle @
efe9d1df
...
...
@@ -73,7 +73,7 @@ new file mode 100644
index 0000000..4858192
--- /dev/null
+++ b/include/xmlsec/mscrypto/akmngr.h
@@ -0,0 +1,
71
@@
@@ -0,0 +1,
53
@@
+/**
+ * XMLSec library
+ *
...
...
@@ -103,24 +103,6 @@ index 0000000..4858192
+) ;
+
+XMLSEC_CRYPTO_EXPORT int
+xmlSecMSCryptoAppliedKeysMngrSymKeyLoad(
+ xmlSecKeysMngrPtr mngr ,
+ HCRYPTKEY symKey
+) ;
+
+XMLSEC_CRYPTO_EXPORT int
+xmlSecMSCryptoAppliedKeysMngrPubKeyLoad(
+ xmlSecKeysMngrPtr mngr ,
+ HCRYPTKEY pubKey
+) ;
+
+XMLSEC_CRYPTO_EXPORT int
+xmlSecMSCryptoAppliedKeysMngrPriKeyLoad(
+ xmlSecKeysMngrPtr mngr ,
+ HCRYPTKEY priKey
+) ;
+
+XMLSEC_CRYPTO_EXPORT int
+xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore (
+ xmlSecKeysMngrPtr mngr ,
+ HCERTSTORE keyStore
...
...
@@ -514,7 +496,7 @@ new file mode 100644
index 0000000..3bbd124
--- /dev/null
+++ b/src/mscrypto/akmngr.c
@@ -0,0 +1,2
36
@@
@@ -0,0 +1,2
09
@@
+/**
+ * XMLSec library
+ *
...
...
@@ -629,33 +611,6 @@ index 0000000..3bbd124
+}
+
+int
+xmlSecMSCryptoAppliedKeysMngrSymKeyLoad(
+ xmlSecKeysMngrPtr mngr ,
+ HCRYPTKEY symKey
+) {
+ /*TODO: import the key into keys manager.*/
+ return(0) ;
+}
+
+int
+xmlSecMSCryptoAppliedKeysMngrPubKeyLoad(
+ xmlSecKeysMngrPtr mngr ,
+ HCRYPTKEY pubKey
+) {
+ /*TODO: import the key into keys manager.*/
+ return(0) ;
+}
+
+int
+xmlSecMSCryptoAppliedKeysMngrPriKeyLoad(
+ xmlSecKeysMngrPtr mngr ,
+ HCRYPTKEY priKey
+) {
+ /*TODO: import the key into keys manager.*/
+ return(0) ;
+}
+
+int
+xmlSecMSCryptoAppliedKeysMngrAdoptKeyStore (
+ xmlSecKeysMngrPtr mngr ,
+ HCERTSTORE keyStore
...
...
xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
Dosyayı görüntüle @
efe9d1df
...
...
@@ -1120,9 +1120,6 @@ OUString SecurityEnvironment_MSCryptImpl::getSecurityEnvironmentInformation() th
xmlSecKeysMngrPtr
SecurityEnvironment_MSCryptImpl
::
createKeysManager
()
throw
(
Exception
,
RuntimeException
)
{
unsigned
int
i
;
HCRYPTKEY
symKey
;
HCRYPTKEY
pubKey
;
xmlSecKeysMngrPtr
pKeysMngr
=
nullptr
;
/*-
...
...
@@ -1132,24 +1129,6 @@ xmlSecKeysMngrPtr SecurityEnvironment_MSCryptImpl::createKeysManager() throw( Ex
if
(
pKeysMngr
==
nullptr
)
throw
RuntimeException
()
;
/*-
* Adopt symmetric key into keys manager
*/
for
(
i
=
0
;
(
symKey
=
getSymKey
(
i
)
)
!=
NULL
;
i
++
)
{
if
(
xmlSecMSCryptoAppliedKeysMngrSymKeyLoad
(
pKeysMngr
,
symKey
)
<
0
)
{
throw
RuntimeException
()
;
}
}
/*-
* Adopt asymmetric public key into keys manager
*/
for
(
i
=
0
;
(
pubKey
=
getPubKey
(
i
)
)
!=
NULL
;
i
++
)
{
if
(
xmlSecMSCryptoAppliedKeysMngrPubKeyLoad
(
pKeysMngr
,
pubKey
)
<
0
)
{
throw
RuntimeException
()
;
}
}
/*-
* Adopt system default certificate store.
*/
...
...
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