Merge "upd: improve digest explanation and make SHA512 default"

diff --combined src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
index 1067681cf2d1e78868690590dbc4e84d2d5e189b,e49d7b9a7ad8a90092f967457f34d97ecfe50242..5edf362e4877ef2c505ca5c6636e60b91b9b0b42
--- 1/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
--- 2/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateRequest.java
@@@ -225,6 -225,8 +225,8 @@@ public class CertificateRequest 
              selectedDigest = Digest.SHA512;
          } else if (sign.toLowerCase().startsWith("sha384")) {
              selectedDigest = Digest.SHA384;
+         } else if (sign.toLowerCase().startsWith("sha256")) {
+             selectedDigest = Digest.SHA256;
          }
      }
  
@@@ -424,7 -426,7 +426,7 @@@
          if (ctx.getTarget() instanceof Organisation) {
              Organisation org = (Organisation) ctx.getTarget();
              subject.put("O", org.getName());
 -            subject.put("C", org.getState().getCode());
 +            subject.put("C", org.getCountry().getCode());
              subject.put("ST", org.getProvince());
              subject.put("L", org.getCity());
              if (ou != null) {