[Libreoffice-commits] core.git: xmlsecurity/source

[Thomas Arnhold]

 xmlsecurity/source/xmlsec/mscrypt/oid.hxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit f1a96446fab8f65e77a1cb0996e43c6523fe2873
Author: Thomas Arnhold <thomas at arnhold.org>
Date:   Mon Feb 25 20:50:19 2013 +0100

    Remove duplicate OID
    
    This ID is refers to digestedData and hashedData.
    
    http://msdn.microsoft.com/en-us/library/windows/desktop/aa381133(v=vs.85).aspx
    
    Change-Id: I2b9585332e27fad860aee458ef3183a9772e9c3f
    Reviewed-on: https://gerrit.libreoffice.org/2403
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
index acbaa50..88f4c74 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/oid.hxx
@@ -58,7 +58,6 @@ OIDItem OIDs[] = {
     {"1.2.840.113549.1.7.3",    "PKCS #7 Enveloped Data"},
     {"1.2.840.113549.1.7.4",    "PKCS #7 Signed and Enveloped Data"},
     {"1.2.840.113549.1.7.5",    "PKCS #7 Digested Data"},
-    {"1.2.840.113549.1.7.5",    "PKCS #7 Digested Data"},
     {"1.2.840.113549.1.7.6",    "PKCS #7 Encrypted Data"},
     {"1.2.840.113549.1.9.1",    "PKCS #9 Email Address"},
     {"1.2.840.113549.1.9.2",    "PKCS #9 Unstructured Name"},
@@ -150,7 +149,7 @@ OIDItem OIDs[] = {
     {"1.2.643.2.2.36.0", "GOST_R_34.10-2001_Sign_DH_PRO"}
 };
 
-int nOID = 120;
+int nOID = 119;
 
 #endif