X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=tests%2Forg%2Fcacert%2Fgigi%2Femail%2FTestSendmail.java;h=3535abb006193919f20ebd288ac55dc70995576b;hb=a22e35843a60f49ae4e29d8ba5d120f46ebf38ec;hp=ec3f69f2d581f09458a3c30757eba65b10d5058c;hpb=2794b072b6df18f33fa77e23f8f11502d43499d8;p=gigi.git diff --git a/tests/org/cacert/gigi/email/TestSendmail.java b/tests/org/cacert/gigi/email/TestSendmail.java index ec3f69f2..3535abb0 100644 --- a/tests/org/cacert/gigi/email/TestSendmail.java +++ b/tests/org/cacert/gigi/email/TestSendmail.java @@ -21,6 +21,7 @@ import java.security.cert.CertificateException; import java.util.Base64; import java.util.Date; import java.util.Properties; +import java.util.Random; import javax.net.ssl.SSLSocketFactory; @@ -39,6 +40,8 @@ import sun.security.x509.X509CertInfo; public class TestSendmail extends ConfiguredTest { + private static final Random rng = new Random(); + @Test public void testSendmail() throws IOException, GeneralSecurityException { initSelfsign(); @@ -104,13 +107,16 @@ public class TestSendmail extends ConfiguredTest { } private void initSelfsign() throws GeneralSecurityException, CertificateException, IOException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException { + assumeNotNull(getTestProps().getProperty("emailProvider.smtpHost"), getTestProps().getProperty("emailProvider.smtpPort")); Properties prop = new Properties(); prop.setProperty("emailProvider", "org.cacert.gigi.email.Sendmail"); + prop.setProperty("emailProvider.smtpHost", getTestProps().getProperty("emailProvider.smtpHost")); + prop.setProperty("emailProvider.smtpPort", getTestProps().getProperty("emailProvider.smtpPort")); KeyPair kp = generateKeypair(); X509CertInfo info = new X509CertInfo(); // Add all mandatory attributes info.set(X509CertInfo.VERSION, new CertificateVersion(CertificateVersion.V3)); - info.set(X509CertInfo.SERIAL_NUMBER, new CertificateSerialNumber(new java.util.Random().nextInt() & 0x7fffffff)); + info.set(X509CertInfo.SERIAL_NUMBER, new CertificateSerialNumber(rng.nextInt() & 0x7fffffff)); AlgorithmId algID = AlgorithmId.get("SHA256WithRSA"); info.set(X509CertInfo.ALGORITHM_ID, new CertificateAlgorithmId(algID)); info.set(X509CertInfo.SUBJECT, new X500Name("EMAIL=system@cacert.org"));