Commit 33af6a0b authored by Steven Fackler's avatar Steven Fackler
Browse files

Merge pull request #100 from gkoz/new_cert 

Replace an expired cert with a new one to make tests happy
parents 3e98880f ef9e0b00

src/ssl/tests.rs

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ fn test_verify_callback_data() { 
    // in DER format.

    // Command: openssl x509 -in test/cert.pem  -outform DER | openssl dgst -sha256

    // Please update if "test/cert.pem" will ever change

    let node_hash_str = "6204f6617e1af7495394250655f43600cd483e2dfc2005e92d0fe439d0723c34";

    let node_hash_str = "46e3f1a6d17a41ce70d0c66ef51cee2ab4ba67cac8940e23f10c1f944b49fb5c";

    let node_id = node_hash_str.from_hex().unwrap();

    ctx.set_verify_with_data(SslVerifyPeer, callback, node_id);

    ctx.set_verify_depth(1);

src/x509/mod.rs

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ impl<'a, T: AsStr<'a>> ToStr for Vec<T> { 
///        .set_valid_period(365*2)

///        .set_CN("SuperMegaCorp Inc.")

///        .set_sign_hash(SHA256)

///        .set_usage([DigitalSignature]);

///        .set_usage(&[DigitalSignature]);

///

/// let (cert, pkey) = gen.generate().unwrap();

///

src/x509/tests.rs

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ fn test_cert_loading() { 
    // in DER format.

    // Command: openssl x509 -in test/cert.pem  -outform DER | openssl dgst -sha256

    // Please update if "test/cert.pem" will ever change

    let hash_str = "6204f6617e1af7495394250655f43600cd483e2dfc2005e92d0fe439d0723c34";

    let hash_str = "46e3f1a6d17a41ce70d0c66ef51cee2ab4ba67cac8940e23f10c1f944b49fb5c";

    let hash_vec = hash_str.from_hex().unwrap();



    assert_eq!(fingerprint.as_slice(), hash_vec.as_slice());

test/cert.pem

+9 −9
Original line number Diff line number Diff line 
-----BEGIN CERTIFICATE-----

MIIDXTCCAkWgAwIBAgIJAJUaA2QC829wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV

MIIDXTCCAkWgAwIBAgIJAMWJMG/NYWQyMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV

BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX

aWRnaXRzIFB0eSBMdGQwHhcNMTMxMDIyMDUzODU5WhcNMTQxMDIyMDUzODU5WjBF

aWRnaXRzIFB0eSBMdGQwHhcNMTQxMTIwMDU0MjIxWhcNMTcxMTE5MDU0MjIxWjBF

MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50

ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB

CgKCAQEA2E9uYoLpX4eMGz6+l+1ZdD11Y1PQjNjqSA7/nq0Q6gogPLds99a+Ca7B
@@ -11,11 +11,11 @@ ImKdwDBhuqzdBpBODQW/VCn0KG54CvWdwT0iqg7CvLuXQGyxM8K17SAiBtn6N38S 
0jeL4D9IrBfi9PCYGpAn3jKr4oBEJVRCNvvni3Q9ikJ+GEF5nvLLVM+I98/o0vCu

Y2o7+1LiwViGONJ1BfRgdFWMjz0BfQIDAQABo1AwTjAdBgNVHQ4EFgQU509vewJT

k6qdvjT8e52gTE4+V9EwHwYDVR0jBBgwFoAU509vewJTk6qdvjT8e52gTE4+V9Ew

DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAb0Sz/ixFc+pShXur1peh

J0n7sPxX29WyTN8IZ+Sl/Ks0vG6bmtO1kAudVigStdQKeBPco+c2/+BF1sL79pXf

Ao1hOWCkXVu6E/Nxl5rZlGNjkxwurKLNV5mZ6nXYkseYZH9A2ighGYQHj4YqspN2

2+/K1DLNBZCsZF6XozhUiDysUGN/xVh6TE0gsPvL1A27Xe4mQ8vd8Mz7av4dek//

V9F+cXnVBTAqLPpEbAX+0+k1QZtOVnDGovshlRFZ8d17f0pJZ66n9k6TPriQNWV/

RXjIOBLbXtPFL5w6MetkEBE+DsRckLT/50cf+f/y8CHv9v9iobu4LpTjx/8l0GuQ

hg==

DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAnLxMvrhgQrdKUbd+RSl3

i6tEfexDepO5QOMIL/m7w/OAkXddu7Y/IuLSgAztp7cu8tQeeBTqbO9T9XKRd1ZD

hMN3QPZwX1ftREPd1mhe3LQgJ/Q3AbrtlW+0XcANBCTiYi19X193sU2a3Z2nzd5v

vSvrP1W3Yxzvu7Jwvhgl20BQ0fREpPVfZTrJRhg8/jdLA8TmKZA7012LKh59BCEX

dXgXc3KYb+Fn8usj79P1nP1YhYmX0Lp0IuC0i1z+FoP/NxNMe+ebXPjM9KlkvQK1

Vy9sIxV9MAlXpGsMvBJAte94JRikYkQTPjMT1DGQQYGpHIYb3a8jcWvmZPEEaqhB

Ag==

-----END CERTIFICATE-----