Skip to content

Commit

Permalink
update xmlsec status
Browse files Browse the repository at this point in the history
  • Loading branch information
Miklos Vajna committed Mar 2, 2018
1 parent 9bb31fb commit 3b4097c
Show file tree
Hide file tree
Showing 4 changed files with 120 additions and 25 deletions.
11 changes: 11 additions & 0 deletions libreoffice/NOTES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2623,6 +2623,17 @@ idea: if the style has no sbasedon (or it's 0) and li/ri/fi(n) is 0, ignore it

make check: CppunitTest_sw_rtfimport -> testTdf112211_2::Import breaks -> need to rework it

=== 2018-03-02

https://bugs.documentfoundation.org/show_bug.cgi?id=115861

- testBnc875718 breaks, newline in body text

all these are needed?
- DomainMapper_Impl::RemoveLastParagraph -> needed by new bug
- DomainMapper_Impl::finishParagraph -> half of that is needed
- DomainMapper_Impl::PushFieldContext

<<<

Problematic bugs:
Expand Down
10 changes: 10 additions & 0 deletions libreoffice/find-unneeded-includes2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ def getFwdDecl(include, keyword):


def ignoreRemoval(include, toAdd, currentFileName):
# global rules

# Avoid replacing .hpp with .hdl in the com::sun::star namespace.
if include.startswith("com/sun/star") and include.endswith(".hpp"):
hdl = include.replace(".hpp", ".hdl")
Expand Down Expand Up @@ -98,11 +100,16 @@ def ignoreRemoval(include, toAdd, currentFileName):
if include in toAdd:
return True

# writerfilter rules

# IWYU assumes std::stack<IncompleteType> in a header is OK, but that's not
# the case for all of LO's supported platforms.
# See <https://github.com/include-what-you-use/include-what-you-use/issues/175>.
if currentFileName.endswith("writerfilter/source/rtftok/rtfsdrimport.hxx") and include.endswith("dmapper/GraphicZOrderHelper.hxx"):
return True

# sw rules

if include == "list":
fileNames = [
"sw/inc/PostItMgr.hxx",
Expand Down Expand Up @@ -170,6 +177,9 @@ def ignoreRemoval(include, toAdd, currentFileName):
if currentFileName.endswith("sw/inc/ring.hxx") and include == "utility":
# std::wap<> usage.
return True
if currentFileName.endswith("sw/inc/shellid.hxx") and include == "sfx2/shell.hxx":
# SFX_INTERFACE_SW_START usage.
return True

return False

Expand Down
6 changes: 5 additions & 1 deletion xmlsec/NOTES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ make check 2>&1 |tee out
== Linux building

----
./configure --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls --enable-silent-rules --without-openssl --without-gcrypt --enable-debugging
./configure --with-pic --disable-shared --disable-crypto-dl --without-libxslt --without-gnutls --enable-silent-rules --without-openssl --without-gcrypt --enable-debugging --enable-werror --enable-pedantic
----

clang-tidy:
Expand All @@ -45,7 +45,9 @@ clang-tidy:

TODO:
- diff-backend dsig problems
- phaos-xmldsig-three/signature-rsa-enveloped
- ecdsa-sha384? might be interesting from test-case (works in openssl)/nss point of view
- ecdsa-md5? no testcase/openssl/nss for that
- decrypt
- encrypt
- mingw
Expand Down Expand Up @@ -73,6 +75,8 @@ win32/binaries/xmlsec.exe check-transforms --crypto mscng --crypto-config win32
win32/binaries/xmlsec.exe check-key-data --crypto mscng --crypto-config win32/tmp/xmlsec-crypto-config ecdsa x509
win32/binaries/xmlsec.exe verify --crypto mscng --crypto-config win32/tmp/xmlsec-crypto-config --trusted-der tests/keys/cacert.der --enabled-key-data x509 tests/aleksey-xmldsig-01/enveloping-sha256-ecdsa-sha256.xml
win32/binaries/xmlsec.exe sign --crypto mscng --crypto-config win32/tmp/xmlsec-crypto-config --pkcs12-persist --pkcs12 tests/keys/ecdsa-secp256r1-key.p12 --pwd secret123 --output win32/tmp/output.xml tests/aleksey-xmldsig-01/enveloping-sha256-ecdsa-sha256.tmpl
win32/binaries/xmlsec.exe verify --crypto mscng --crypto-config win32/tmp/xmlsec-crypto-config --trusted-der tests/phaos-xmldsig-three/certs/rsa-ca-cert.der --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 tests/phaos-xmldsig-three/signature-rsa-enveloped.xml
----

How to debug:
Expand Down
118 changes: 94 additions & 24 deletions xmlsec/mscng-dsig-status.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ xmldsig2ed-tests/xpointer-5-SUN
xmldsig2ed-tests/xpointer-6-SUN
Checking required transforms Skip
aleksey-xmldsig-01/enveloping-dsa-x509chain
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature OK
Create new signature OK
Verify new signature OK
aleksey-xmldsig-01/enveloping-rsa-x509chain
Checking required transforms OK
Checking required key data OK
Expand Down Expand Up @@ -64,7 +68,11 @@ aleksey-xmldsig-01/enveloping-sha512-hmac-sha512
aleksey-xmldsig-01/enveloping-sha512-hmac-sha512-64
Checking required transforms Skip
aleksey-xmldsig-01/enveloping-md5-rsa-md5
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature OK
Create new signature OK
Verify new signature OK
aleksey-xmldsig-01/enveloping-ripemd160-rsa-ripemd160
Checking required transforms Skip
aleksey-xmldsig-01/enveloping-sha1-rsa-sha1
Expand Down Expand Up @@ -140,11 +148,23 @@ aleksey-xmldsig-01/x509data-sn-test
Create new signature Fail
Verify new signature Fail
merlin-xmldsig-twenty-three/signature-enveloped-dsa
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature Fail
Create new signature Fail
Verify new signature Fail
merlin-xmldsig-twenty-three/signature-enveloping-dsa
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature Fail
Create new signature Fail
Verify new signature Fail
merlin-xmldsig-twenty-three/signature-enveloping-b64-dsa
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature Fail
Create new signature Fail
Verify new signature Fail
merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1-40
Checking required transforms Skip
merlin-xmldsig-twenty-three/signature-enveloping-hmac-sha1
Expand All @@ -156,23 +176,51 @@ merlin-xmldsig-twenty-three/signature-enveloping-rsa
Create new signature Fail
Verify new signature Fail
merlin-xmldsig-twenty-three/signature-external-b64-dsa
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature Fail
Create new signature Fail
Verify new signature Fail
merlin-xmldsig-twenty-three/signature-external-dsa
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Create new signature Fail
Verify new signature Fail
merlin-xmldsig-twenty-three/signature-keyname
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Create new signature OK
Verify new signature OK
merlin-xmldsig-twenty-three/signature-x509-crt
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Create new signature OK
Verify new signature OK
merlin-xmldsig-twenty-three/signature-x509-sn
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Create new signature OK
Verify new signature OK
merlin-xmldsig-twenty-three/signature-x509-is
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Create new signature OK
Verify new signature OK
merlin-xmldsig-twenty-three/signature-x509-ski
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Create new signature OK
Verify new signature OK
merlin-xmldsig-twenty-three/signature-retrievalmethod-rawx509crt
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Create new signature OK
Verify new signature Fail
merlin-xmldsig-twenty-three/signature
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Create new signature Fail
Verify new signature Fail
merlin-xmlenc-five/encsig-ripemd160-hmac-ripemd160-kw-tripledes
Checking required transforms Skip
merlin-xmlenc-five/encsig-sha256-hmac-sha256-kw-aes128
Expand All @@ -186,25 +234,45 @@ merlin-xmlenc-five/encsig-hmac-sha256-rsa-1_5
merlin-xmlenc-five/encsig-hmac-sha256-rsa-oaep-mgf1p
Checking required transforms Skip
merlin-exc-c14n-one/exc-signature
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature Fail
Create new signature Fail
Verify new signature Fail
merlin-exc-c14n-one/exc-signature
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature Fail
merlin-c14n-three/signature
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature Fail
merlin-xpath-filter2-three/sign-xfdl
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature Fail
merlin-xpath-filter2-three/sign-spec
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature Fail
phaos-xmldsig-three/signature-big
Checking required transforms Skip
phaos-xmldsig-three/signature-dsa-detached
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature Fail
phaos-xmldsig-three/signature-dsa-enveloped
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature Fail
phaos-xmldsig-three/signature-dsa-enveloping
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature Fail
phaos-xmldsig-three/signature-dsa-manifest
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature Fail
phaos-xmldsig-three/signature-hmac-md5-c14n-enveloping
Checking required transforms Skip
phaos-xmldsig-three/signature-hmac-sha1-40-c14n-comments-detached
Expand Down Expand Up @@ -276,7 +344,9 @@ merlin-xmldsig-twenty-three/signature-x509-crt-crl
Checking required key data OK
Verify existing signature OK
aleksey-xmldsig-01/enveloping-expired-cert
Checking required transforms Skip
Checking required transforms OK
Checking required key data OK
Verify existing signature OK
aleksey-xmldsig-01/dtd-hmac-91
Checking required transforms Skip
phaos-xmldsig-three/signature-rsa-detached-xslt-transform-bad-retrieval-method
Expand Down

0 comments on commit 3b4097c

Please sign in to comment.