Changeset 5386 for branches/2.3/security/ExpressoCert/src
- Timestamp:
- 01/17/12 15:57:56 (13 years ago)
- Location:
- branches/2.3/security/ExpressoCert/src/br/gov/serpro
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.3/security/ExpressoCert/src/br/gov/serpro/cert/DigitalCertificate.java
r5276 r5386 483 483 return null; 484 484 } 485 485 486 486 Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider()); 487 487 … … 837 837 838 838 if (this.setup.getParameter("debug").equalsIgnoreCase("true")) { 839 System.out.println("\nthis.cert: "+ Base64Utils.der2pem(this.cert.getEncoded())+"\n");839 System.out.println("\nthis.cert: "+ this.getPEMCertificate()+"\n"); 840 840 } 841 841 842 httppost.addParameter("certificado", Base64Utils.der2pem(this.cert.getEncoded()));842 httppost.addParameter("certificado", this.getPEMCertificate()); 843 843 httpclient.executeMethod(httppost); 844 844 resposta = httppost.getResponseBodyAsString().split(CRLF); … … 976 976 public String getPEMCertificate() throws CertificateEncodingException { 977 977 if (this.cert != null){ 978 return Base64Utils.der2pem(this.cert.getEncoded() );978 return Base64Utils.der2pem(this.cert.getEncoded(), true); 979 979 } 980 980 return null; -
branches/2.3/security/ExpressoCert/src/br/gov/serpro/setup/Setup.java
r5152 r5386 145 145 Locale buildLocale(String localeCode) { 146 146 147 String[] localeItems = localeCode.split("_"); 147 String splitter = localeCode.indexOf('_') != -1 ? "_" : "-" ; 148 String[] localeItems = localeCode.split(splitter); 148 149 Locale locale; 149 150 … … 168 169 public void addLanguageResource(String langResource) { 169 170 System.out.println("registrando recurso de linguagem " + langResource); 170 langResources.put(langResource, ResourceBundle.getBundle( langResource, currentLocale));171 langResources.put(langResource, ResourceBundle.getBundle("br.gov.serpro.i18n."+langResource, currentLocale)); 171 172 } 172 173 -
branches/2.3/security/ExpressoCert/src/br/gov/serpro/util/Base64Utils.java
r5152 r5386 144 144 145 145 String beginCertificate = "-----BEGIN CERTIFICATE-----" +CRLF; 146 String endCertificate = "-----END CERTIFICATE-----" ;146 String endCertificate = "-----END CERTIFICATE-----" +CRLF; 147 147 148 148 if (isCert){
Note: See TracChangeset
for help on using the changeset viewer.