Changeset 5276 for branches/2.3

Timestamp:

12/20/11 14:49:00 (12 years ago)

Author:

rafaelraymundo

Message:

Ticket #2395 - Assinatura/cifragem digital de emails - Suporte a SHA512.

Location:

branches/2.3/security

Files:

• ExpressoCert.jar (modified) (previous)
• ExpressoCert/src/br/gov/serpro/cert/DigitalCertificate.java (modified) (1 diff)

branches/2.3/security/ExpressoCert/src/br/gov/serpro/cert/DigitalCertificate.java

@@ -539 +539 @@
         //SMIMESignedGenerator gen = new SMIMESignedGenerator();
 
-        gen.addSigner(keypair.getPrivate(), (X509Certificate) certificate, SMIMESignedGenerator.DIGEST_SHA1, new AttributeTable(signedAttrs), null);
+        // TODO:  Verificar se este código é suficiente para cumprir a norma.
+        if (this.setup.getParameter("debug").equalsIgnoreCase("true")) {
+            Provider.Service sha512 = this.keyStore.getProvider().getService("MessageDigest", "SHA-512");
+            Provider.Service sha256 = this.keyStore.getProvider().getService("MessageDigest", "SHA-256");
+
+            if (sha512 != null){
+                System.out.println("sha512: " + sha512.getType() + " : " + sha512.getAlgorithm());
+            } else {
+                    System.out.println("sha512: não suportado!");
+            }
+
+            if (sha256 != null){
+                    System.out.println("sha256: " + sha256.getType() + " : " + sha256.getAlgorithm());
+            } else {
+                    System.out.println("sha256: não suportado!");
+            }
+        }
+
+        // TODO: Verificar problema com MessageDigest SHA-512.
+//        if (this.keyStore.getProvider().getService("MessageDigest", "SHA-512") != null){
+//            gen.addSigner(keypair.getPrivate(), (X509Certificate) certificate, SMIMESignedGenerator.DIGEST_SHA512, new AttributeTable(signedAttrs), null);
+//        }
+//        else
+        if (this.keyStore.getProvider().getService("MessageDigest", "SHA-256") != null){
+            gen.addSigner(keypair.getPrivate(), (X509Certificate) certificate, SMIMESignedGenerator.DIGEST_SHA256, new AttributeTable(signedAttrs), null);
+        }
+        else {
+            gen.addSigner(keypair.getPrivate(), (X509Certificate) certificate, SMIMESignedGenerator.DIGEST_SHA1, new AttributeTable(signedAttrs), null);
+        }
 
         gen.addCertificatesAndCRLs(certsAndcrls);