Add thumbprint support in XCertificate.

Issue number:
Submitted by:
Reviewed by:

4 files changed, 40 insertions, 24 deletions

diff --git a/xmlsecurity/tools/demo/multisigdemo.cxx b/xmlsecurity/tools/demo/multisigdemo.cxx
index 0396282c7cc1..bffea88634ec 100644
--- a/xmlsecurity/tools/demo/multisigdemo.cxx
+++ b/xmlsecurity/tools/demo/multisigdemo.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: multisigdemo.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mt $ $Date: 2004-07-12 13:15:30 $
+ *  last change: $Author: mmi $ $Date: 2004-07-15 08:12:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -184,7 +184,7 @@ int SAL_CALL main( int argc, char **argv )
     /*
      * creates signature
      */
-    bDone = aSignatureHelper.CreateAndWriteSignatue( xOutputStream );
+    bDone = aSignatureHelper.CreateAndWriteSignature( xOutputStream );
     if ( !bDone )
     {
         fprintf( stderr, "Error creating Signature!\n" );
@@ -216,7 +216,7 @@ int SAL_CALL main( int argc, char **argv )
     xLockBytes = new SvLockBytes( pStream, TRUE );
     xInputStream = new utl::OInputStreamHelper( xLockBytes, nBytes );
 
-    bDone = aSignatureHelper.ReadAndVerifySignatue( xInputStream );
+    bDone = aSignatureHelper.ReadAndVerifySignature( xInputStream );
     xInputStream->closeInput();
 
     if ( !bDone )
@@ -269,7 +269,7 @@ int SAL_CALL main( int argc, char **argv )
     xDocumentHandler = aSignatureHelper.CreateDocumentHandlerWithHeader( xOutputStream);
 
     aSignatureHelper.ExportSignature( xDocumentHandler, signatureInformations[0]);
-    bDone = aSignatureHelper.CreateAndWriteSignatue( xDocumentHandler );
+    bDone = aSignatureHelper.CreateAndWriteSignature( xDocumentHandler );
     aSignatureHelper.ExportSignature( xDocumentHandler, signatureInformations[1]);
     aSignatureHelper.CloseDocumentHandler( xDocumentHandler);
 
@@ -297,7 +297,7 @@ int SAL_CALL main( int argc, char **argv )
     xLockBytes = new SvLockBytes( pStream, TRUE );
     xInputStream = new utl::OInputStreamHelper( xLockBytes, nBytes );
 
-    bDone = aSignatureHelper.ReadAndVerifySignatue( xInputStream );
+    bDone = aSignatureHelper.ReadAndVerifySignature( xInputStream );
     xInputStream->closeInput();
 
     if ( !bDone )
@@ -328,7 +328,7 @@ int SAL_CALL main( int argc, char **argv )
     xLockBytes = new SvLockBytes( pStream, TRUE );
     xInputStream = new utl::OInputStreamHelper( xLockBytes, nBytes );
 
-    bDone = aSignatureHelper.ReadAndVerifySignatue( xInputStream );
+    bDone = aSignatureHelper.ReadAndVerifySignature( xInputStream );
     xInputStream->closeInput();
 
     if ( !bDone )
diff --git a/xmlsecurity/tools/demo/signdemo.cxx b/xmlsecurity/tools/demo/signdemo.cxx
index 908a9b794cdb..4ffe5f95b2f6 100644
--- a/xmlsecurity/tools/demo/signdemo.cxx
+++ b/xmlsecurity/tools/demo/signdemo.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: signdemo.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mt $ $Date: 2004-07-12 13:15:30 $
+ *  last change: $Author: mmi $ $Date: 2004-07-15 08:12:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -199,7 +199,7 @@ int SAL_CALL main( int argc, char **argv )
     /*
      * creates signature
      */
-    bool bDone = aSignatureHelper.CreateAndWriteSignatue( xOutputStream );
+    bool bDone = aSignatureHelper.CreateAndWriteSignature( xOutputStream );
 
     if ( !bDone )
     {
diff --git a/xmlsecurity/tools/demo/util.cxx b/xmlsecurity/tools/demo/util.cxx
index 1ddd6d7ddabf..47466a2a9fc5 100644
--- a/xmlsecurity/tools/demo/util.cxx
+++ b/xmlsecurity/tools/demo/util.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: util.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mmi $ $Date: 2004-07-14 08:12:30 $
+ *  last change: $Author: mmi $ $Date: 2004-07-15 08:12:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,6 +67,21 @@
 namespace cssu = com::sun::star::uno;
 namespace cssl = com::sun::star::lang;
 
+::rtl::OUString printHexString(cssu::Sequence< sal_Int8 > data)
+{
+    int length = data.getLength();
+    ::rtl::OUString result;
+
+    char number[4];
+    for (int j=0; j<length; j++)
+    {
+        sprintf(number, "%02X ", (unsigned char)data[j]);
+        result += rtl::OUString::createFromAscii( number );
+    }
+
+    return result;
+}
+
 cssu::Reference< cssl::XMultiServiceFactory > serviceManager(
     cssu::Reference< cssu::XComponentContext > &xContext,
     rtl::OUString sUnoUrl,
@@ -189,17 +204,18 @@ cssu::Reference< cssl::XMultiServiceFactory > serviceManager(
                     result += xCertPath[i]->getSubjectPublicKeyAlgorithm();
                     result += rtl::OUString::createFromAscii( "\n    Signature algorithm : " );
                     result += xCertPath[i]->getSignatureAlgorithm();
-                    result += rtl::OUString::createFromAscii( "\n    Subject public key value : " );
 
+                    result += rtl::OUString::createFromAscii( "\n    Subject public key value : " );
                     cssu::Sequence< sal_Int8 > keyValue = xCertPath[i]->getSubjectPublicKeyValue();
-            int length = keyValue.getLength();
-
-            char number[64];
-                    for (int j=0; j<length; j++)
-                    {
-                        sprintf(number, "%02X ", (unsigned char)keyValue[j]);
-                        result += rtl::OUString::createFromAscii( number );
-                    }
+                    result += printHexString(keyValue);
+
+                    result += rtl::OUString::createFromAscii( "\n    Thumbprint (SHA1) : " );
+                    cssu::Sequence< sal_Int8 > SHA1Thumbprint = xCertPath[i]->getSHA1Thumbprint();
+                    result += printHexString(SHA1Thumbprint);
+
+                    result += rtl::OUString::createFromAscii( "\n    Thumbprint (MD5) : " );
+                    cssu::Sequence< sal_Int8 > MD5Thumbprint = xCertPath[i]->getMD5Thumbprint();
+                    result += printHexString(MD5Thumbprint);
 
                     result += rtl::OUString::createFromAscii( "\n  <<\n" );
         }
diff --git a/xmlsecurity/tools/demo/verifydemo.cxx b/xmlsecurity/tools/demo/verifydemo.cxx
index 0ba3e65c9d6d..790bdbef5131 100644
--- a/xmlsecurity/tools/demo/verifydemo.cxx
+++ b/xmlsecurity/tools/demo/verifydemo.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: verifydemo.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: mt $ $Date: 2004-07-12 13:15:30 $
+ *  last change: $Author: mmi $ $Date: 2004-07-15 08:12:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -151,7 +151,7 @@ int SAL_CALL main( int argc, char **argv )
     /*
      * verifies the signature
      */
-    bool bDone = aSignatureHelper.ReadAndVerifySignatue( xInputStream );
+    bool bDone = aSignatureHelper.ReadAndVerifySignature( xInputStream );
 
     /*
      * closes the signature stream