Date: Wed, 21 Nov 2018 15:06:26 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r485518 - head/net-im/fractal/files Message-ID: <201811211506.wALF6QQx087881@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Nov 21 15:06:25 2018 New Revision: 485518 URL: https://svnweb.freebsd.org/changeset/ports/485518 Log: net-im/fractal: unbreak with OpenSSL 1.1.1 thread 'main' panicked at 'Unable to detect OpenSSL version', vendor/openssl/build.rs:16:14 PR: 233300 Reported by: pkg-fallout Obtained from: upstream Approved by: Greg V (maintainer) Added: head/net-im/fractal/files/patch-openssl-1.1.1 (contents, props changed) Added: head/net-im/fractal/files/patch-openssl-1.1.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/fractal/files/patch-openssl-1.1.1 Wed Nov 21 15:06:25 2018 (r485518) @@ -0,0 +1,1096 @@ +https://github.com/sfackler/rust-openssl/commit/276577553501 + +--- vendor/openssl/.cargo-checksum.json.orig 2018-09-04 07:45:22 UTC ++++ vendor/openssl/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"fcbe959e044fc411ad24cadab65b5a6bd86b3520f107403f606c42a509ee4d34","LICENSE":"f3d4287b4a21c5176fea2f9bd4ae800696004e2fb8e05cbc818be513f188a941","README.md":"ddef455b80552146252e22dfe4d638e30ccefa54a2d38d84a9997748ea51e3eb","build.rs":"3b9b0c1fbacbe020698348f2ce88028127e08c150db159c1f6ebc9e1498b07d2","examples/mk_certs.rs":"a1d14ed31aa4a7dee32e525b8a5dcd917a112221689c3d345dad0314023440f1","src/aes.rs":"49b027ef3c12d7a6645b88f292d4b476635d2327e6d86a454e48ba3ff0f28caf","src/asn1.rs":"4c7f6f5a291220f5ad9cd902da50badac6b637e72d945208849a50fcf161dac3","src/bio.rs":"7074ebd4fa44f586e462fc5b0db558303ee1216b15e7e16baf5e9bd38b277d41","src/bn.rs":"6f4fd25503ee1024d432f17fc6a4f64425609e84f987dd5ab5161eea9f154a64","src/cms.rs":"0689448903fa837d3b77a9bd0d89be8259595bb87b1f2d0034d9af83a20ec15f","src/conf.rs":"d797be4214d834ddbd37d0dcf295fe1d41e8c140683490478df750ef58ca5028","src/crypto.rs":"d64ddce6481296f6907ebdebbe834c32a6e633894530f6f7bb10709ded2c5002","src/dh.rs":"d5caf e7b905dad9657afb302d091da7ef72524b10cb58c6e574ee837a7bb88a9","src/dsa.rs":"60cbe93931c161299615ad77bf48f28643693cb98be1b7c6e52e3ce52a8db44f","src/ec.rs":"d05e5ba731d058a0db74a25cbecdaf44501a3ec8d1f1297b61ed906037b66b3b","src/ec_key.rs":"055ea6966bcb3e0b49062b7da9666f4d8ef6e508b4f35db62df9f5ee02c334d9","src/error.rs":"33c0f4d9b4163ba0e2de629e0711071cd742b48ede26a4ac82c96c285579b093","src/ex_data.rs":"41636675caffee86fd50d43ad64d3bb8d2803d0a617fca7f0666e39165ac777b","src/hash.rs":"ae2714606b9e79a6260448f3b50b4d1527af12c11b672fa249b2a877f8d70967","src/lib.rs":"4df5487a176d44060e76595948a48237460b0de664d0e83952b6e54158be5bdc","src/macros.rs":"5da7333178260d3ba4c0192935d97c74f690d8648d71d3e23e9d1f685932f1a3","src/memcmp.rs":"b3455f3be08abe514813bad94a487ca9dfe7b2b4293d8554da10a61ad6f7811e","src/nid.rs":"f1f0583940d8e81aba892678f5ff4ee8170a542c7df6f8ca2e27b65bfff0ab44","src/ocsp.rs":"9223c4b7234ad3997a3c22c346d9d8ded6e1de64c4ad100603eddb966c11bf9a","src/pkcs12.rs":"0c8e34172838943212b4f45 3d2729b064ce77bfd21a6d939cdd64fae2b6d1a38","! src/pkcs5.rs":"b9627f1bd93a80c6b56ae91fd4949eb65734ff7f8540d40c59d3b7b99e9f524a","src/pkey.rs":"cdbc7f47138927ab46e0fe1c727ec1e347ff7b7410f2ee7690e93a18129d7b45","src/rand.rs":"c03dd2079b8b8ed2b9924e773860ad47ec6809056a559213558a8c8326c4dd3a","src/rsa.rs":"899992078b30a7f0eeb4da101836ecb8373ea99e85d909e8d4e501f1944a4078","src/sha.rs":"9ebe13be93dc113a68b6c7a699d2e1929d418d425415949d4e1d42fdb5fb6ef7","src/sign.rs":"c7949c06afc6545f00e75b00a71d162088742d06fa6633b325d7b3ec26beb58e","src/ssl/bio.rs":"d865c8f89d2a720585b259cfac80b67230da553b77d26016c93a995ea1246224","src/ssl/callbacks.rs":"e4d4a2f24fc8746f8d0fc40e1444ca15ab7fd18c35f903df8db456f78722b88d","src/ssl/connector.rs":"eb477cd9ad163a4ef8d6bce6f37297f04ce3c907a3d9f1b6eb8bcbb292f7e948","src/ssl/error.rs":"e91d8574baeb9e8a07ac60eb61637afe129040a666142ced6337e84ff8001510","src/ssl/mod.rs":"9fa4663c35c324b641bcdc8dad7798540d6d458739aa61cac8f85d822f0eef89","src/ssl/tests/mod.rs":"c6052d5890e1a9267b17048c8ac28a35f0892468f8508eecaf18635 8ca9ab2f8","src/ssl/tests/select.rs":"7615c2e0c4b2a11d3662d6c38a7d490b5420b8ff55f89db65570f11cc4a20111","src/stack.rs":"dc7f9c8fdbbfd272efb1e9ac2dfd1f755f731789eff6bf81fc6508d7d079365a","src/string.rs":"7006993c1223533bb531206fe1462aebe67e2f950c0c818d18529d7a977e7077","src/symm.rs":"cd34db1682a5e65ada1e6c779d9a685f57004db6b2e5726ad52de94792470a4b","src/types.rs":"8a89d8f1a95830fe25bda1033a22724293a6d318ba88dc7bdcb53b8fceec3d1b","src/util.rs":"68cad4174696bf7ca1ee911e2f907af540e410a5090033f9ee0af8204a3e5a69","src/verify.rs":"433667ed305e050ce3d044b302991c1367b66cb10c1f7e4f8eb3b5494e8cc63e","src/version.rs":"f7ec8f2971e70cdeeac896cf8588518a8e49fc59ea86063b327fe431935ce0ff","src/x509/extension.rs":"c0458ae9d792e2535b49c478e54fc9e254f01d52189bd931ab32daf60559c485","src/x509/mod.rs":"ad141c6820fcc571eefabbb86d2c58688b35224bf81113d6d5a3ce1bdc936378","src/x509/store.rs":"ce42f9cc9b57db3cfab6364966562f09998eb70ceb463ba9646f6f6d58f580ad","src/x509/tests.rs":"fff33e21197b40ac0b4723f63b16bb1c5 fa84a38608ef4e26772d63371a46444","src/x509/v! erify.rs"! :"3e0d2d33c1afddb32279ff5c6ff7361d1c2304b6df1532c4a3e387c5586a8919","test/alt_name_cert.pem":"53bf9f10c35695019e9d1bc38751e234d8212d9cf3962736acf5e1fac245ab9f","test/cert.pem":"53c8b338be254490c71a6b13da90dc5a59ba596587c548be5673657e04824afb","test/certs.pem":"106d5d22c86e26c3db619b9525567f22333d22de82e4d2850ed379150c638008","test/dhparams.pem":"14d9461949d9ae8ca50a393b008ee2168254f14342b0e17b56c0a62d2905b963","test/dsa-encrypted.pem":"b553599182b55a600358f2d53b78f76cb8c8ac64b19215005daec832028a79bc","test/dsa.pem":"826d513234205fd3dee0bbbf844f0b6fea501145bdf05ea3b14e14df98cbe090","test/dsa.pem.pub":"721677bebf9ab28b8650f98a0cd27658de0c1acd867a4b6e985fe1df95a8bd37","test/dsaparam.pem":"94a1284bdd7d7566151cfde0c7f245e84f7b99ba840f202e3f27ea0160f82988","test/identity.p12":"aceeb3e5516471bd5af9a44bbeffc9559c4f228f67c677d29f36a4b368e2779f","test/key.der":"e8842cd6674b5c77a83e0283cd876a91de404561dfc86d79ce525f6e55b28197","test/key.der.pub":"e559d56bb6ec57ad743dbf972bbcaf263a9fa7d320433ba a71b04f849d987060","test/key.pem":"12d9105a92bf39b615ccb4820c5c1e38c61905483cd30be13f9ab99b98af64ed","test/key.pem.pub":"f5d030df843ddbaba5bf316ae18f1434de5a63a955be66442429dd4f16f161ef","test/keystore-empty-chain.p12":"bbea280f6fe10556d7470df7072ef0e4ee3997e2c0b3666197f423430c0e6b61","test/nid_test_cert.pem":"7047e8d317e284c6b698eee4a0f1a629d50cd4615ad7da85fe90a2ffb6c21611","test/nid_uid_test_cert.pem":"a735211f3b40edbde7084337138fb0aea06aea6c78369c52015253e4b7a17d83","test/pkcs8.der":"8719fc002d59313fb97e46e068ae40db4d9acc0e2debd308ac9eb46329bea487","test/root-ca.key":"b37cf88614980c38e43c4329cdf7162bae48cc8af1fafd54db2fe0d17e458e1d","test/root-ca.pem":"59b9200c35e818bf21be4aaa97ba87bb6a18fd780527a9f9c51cc74212c631a0","test/rsa-encrypted.pem":"ea41b0f1816056672de6abbab43d0e8089da047c329ceed14aace5a5bde713f1","test/rsa.pem":"f866a5506ea9a37ed2f73f62f503e1aff32f7e4145be62b023535f4da1c24416","test/rsa.pem.pub":"2c5eeea39708e90396f9f09d920f2af8b7e9f84ace963c1319072224dd3d302b"},"packa ge":"a3605c298474a3aa69de92d21139fb5e2a81688! d30826235! 9d85cdd0d12a7985"} +\ No newline at end of file ++{"files":{"Cargo.toml":"0646cc47708b2b0ab26870fe4447bab23da96f632ec383c7257202823d64686a","LICENSE":"f3d4287b4a21c5176fea2f9bd4ae800696004e2fb8e05cbc818be513f188a941","README.md":"ddef455b80552146252e22dfe4d638e30ccefa54a2d38d84a9997748ea51e3eb","build.rs":"832447c6bd69503ab653ba2d8ce178b250d331f878e8c0cf02e0486399fd4100","examples/mk_certs.rs":"a1d14ed31aa4a7dee32e525b8a5dcd917a112221689c3d345dad0314023440f1","src/aes.rs":"49b027ef3c12d7a6645b88f292d4b476635d2327e6d86a454e48ba3ff0f28caf","src/asn1.rs":"4c7f6f5a291220f5ad9cd902da50badac6b637e72d945208849a50fcf161dac3","src/bio.rs":"7074ebd4fa44f586e462fc5b0db558303ee1216b15e7e16baf5e9bd38b277d41","src/bn.rs":"6f4fd25503ee1024d432f17fc6a4f64425609e84f987dd5ab5161eea9f154a64","src/cms.rs":"0689448903fa837d3b77a9bd0d89be8259595bb87b1f2d0034d9af83a20ec15f","src/conf.rs":"d797be4214d834ddbd37d0dcf295fe1d41e8c140683490478df750ef58ca5028","src/crypto.rs":"d64ddce6481296f6907ebdebbe834c32a6e633894530f6f7bb10709ded2c5002","src/dh.rs":"a2d1e acad77372ddbbab46e9463a23768f21d59bda68ccbbf8594a3cbbe22a36","src/dsa.rs":"60cbe93931c161299615ad77bf48f28643693cb98be1b7c6e52e3ce52a8db44f","src/ec.rs":"d05e5ba731d058a0db74a25cbecdaf44501a3ec8d1f1297b61ed906037b66b3b","src/ec_key.rs":"055ea6966bcb3e0b49062b7da9666f4d8ef6e508b4f35db62df9f5ee02c334d9","src/error.rs":"33c0f4d9b4163ba0e2de629e0711071cd742b48ede26a4ac82c96c285579b093","src/ex_data.rs":"41636675caffee86fd50d43ad64d3bb8d2803d0a617fca7f0666e39165ac777b","src/hash.rs":"ae2714606b9e79a6260448f3b50b4d1527af12c11b672fa249b2a877f8d70967","src/lib.rs":"4df5487a176d44060e76595948a48237460b0de664d0e83952b6e54158be5bdc","src/macros.rs":"5da7333178260d3ba4c0192935d97c74f690d8648d71d3e23e9d1f685932f1a3","src/memcmp.rs":"b3455f3be08abe514813bad94a487ca9dfe7b2b4293d8554da10a61ad6f7811e","src/nid.rs":"f1f0583940d8e81aba892678f5ff4ee8170a542c7df6f8ca2e27b65bfff0ab44","src/ocsp.rs":"9223c4b7234ad3997a3c22c346d9d8ded6e1de64c4ad100603eddb966c11bf9a","src/pkcs12.rs":"0c8e34172838943212b4f45 3d2729b064ce77bfd21a6d939cdd64fae2b6d1a38","! src/pkcs5.rs":"b288dd0fd4dcbb07e35e5aa54f4d6c4398bd711fd77422f18d7d0843816d9e4e","src/pkey.rs":"cdbc7f47138927ab46e0fe1c727ec1e347ff7b7410f2ee7690e93a18129d7b45","src/rand.rs":"c03dd2079b8b8ed2b9924e773860ad47ec6809056a559213558a8c8326c4dd3a","src/rsa.rs":"899992078b30a7f0eeb4da101836ecb8373ea99e85d909e8d4e501f1944a4078","src/sha.rs":"9ebe13be93dc113a68b6c7a699d2e1929d418d425415949d4e1d42fdb5fb6ef7","src/sign.rs":"c7949c06afc6545f00e75b00a71d162088742d06fa6633b325d7b3ec26beb58e","src/ssl/bio.rs":"d865c8f89d2a720585b259cfac80b67230da553b77d26016c93a995ea1246224","src/ssl/callbacks.rs":"e4d4a2f24fc8746f8d0fc40e1444ca15ab7fd18c35f903df8db456f78722b88d","src/ssl/connector.rs":"181afcbb9296df5e7d6822e9ac9e5a6ef316d400fb4dd74f7c96a3b41e954e7e","src/ssl/error.rs":"e91d8574baeb9e8a07ac60eb61637afe129040a666142ced6337e84ff8001510","src/ssl/mod.rs":"053d28073916373744ae55dd42b73531edee6beb6ae0a5e4eb1cfaff0776c1d7","src/ssl/tests/mod.rs":"ce8d66ce255c3ebc19410b1a63aec913e45887fd8a1636b7ef0e2a4 c19db45cc","src/ssl/tests/select.rs":"7615c2e0c4b2a11d3662d6c38a7d490b5420b8ff55f89db65570f11cc4a20111","src/stack.rs":"dc7f9c8fdbbfd272efb1e9ac2dfd1f755f731789eff6bf81fc6508d7d079365a","src/string.rs":"7006993c1223533bb531206fe1462aebe67e2f950c0c818d18529d7a977e7077","src/symm.rs":"1205910776ea494e25cc885ee76f4aaee5b828544a818a4077fd27d4598dc56a","src/types.rs":"8a89d8f1a95830fe25bda1033a22724293a6d318ba88dc7bdcb53b8fceec3d1b","src/util.rs":"68cad4174696bf7ca1ee911e2f907af540e410a5090033f9ee0af8204a3e5a69","src/verify.rs":"380fff1cd2ce61f5fbd3f6fa9ae8750ad9bf2a26e027a18f7d7d8a3257bc73cc","src/version.rs":"f7ec8f2971e70cdeeac896cf8588518a8e49fc59ea86063b327fe431935ce0ff","src/x509/extension.rs":"c0458ae9d792e2535b49c478e54fc9e254f01d52189bd931ab32daf60559c485","src/x509/mod.rs":"ad141c6820fcc571eefabbb86d2c58688b35224bf81113d6d5a3ce1bdc936378","src/x509/store.rs":"ce42f9cc9b57db3cfab6364966562f09998eb70ceb463ba9646f6f6d58f580ad","src/x509/tests.rs":"fff33e21197b40ac0b4723f63b16bb1c5 fa84a38608ef4e26772d63371a46444","src/x509/v! erify.rs"! :"adf57b696f048f8a16c8c181e2d19092ae37823fe518cee394799892a37902da","test/alt_name_cert.pem":"53bf9f10c35695019e9d1bc38751e234d8212d9cf3962736acf5e1fac245ab9f","test/cert.pem":"53c8b338be254490c71a6b13da90dc5a59ba596587c548be5673657e04824afb","test/certs.pem":"106d5d22c86e26c3db619b9525567f22333d22de82e4d2850ed379150c638008","test/dhparams.pem":"14d9461949d9ae8ca50a393b008ee2168254f14342b0e17b56c0a62d2905b963","test/dsa-encrypted.pem":"b553599182b55a600358f2d53b78f76cb8c8ac64b19215005daec832028a79bc","test/dsa.pem":"826d513234205fd3dee0bbbf844f0b6fea501145bdf05ea3b14e14df98cbe090","test/dsa.pem.pub":"721677bebf9ab28b8650f98a0cd27658de0c1acd867a4b6e985fe1df95a8bd37","test/dsaparam.pem":"94a1284bdd7d7566151cfde0c7f245e84f7b99ba840f202e3f27ea0160f82988","test/identity.p12":"aceeb3e5516471bd5af9a44bbeffc9559c4f228f67c677d29f36a4b368e2779f","test/key.der":"e8842cd6674b5c77a83e0283cd876a91de404561dfc86d79ce525f6e55b28197","test/key.der.pub":"e559d56bb6ec57ad743dbf972bbcaf263a9fa7d320433ba a71b04f849d987060","test/key.pem":"12d9105a92bf39b615ccb4820c5c1e38c61905483cd30be13f9ab99b98af64ed","test/key.pem.pub":"f5d030df843ddbaba5bf316ae18f1434de5a63a955be66442429dd4f16f161ef","test/keystore-empty-chain.p12":"bbea280f6fe10556d7470df7072ef0e4ee3997e2c0b3666197f423430c0e6b61","test/nid_test_cert.pem":"7047e8d317e284c6b698eee4a0f1a629d50cd4615ad7da85fe90a2ffb6c21611","test/nid_uid_test_cert.pem":"a735211f3b40edbde7084337138fb0aea06aea6c78369c52015253e4b7a17d83","test/pkcs8.der":"8719fc002d59313fb97e46e068ae40db4d9acc0e2debd308ac9eb46329bea487","test/root-ca.key":"b37cf88614980c38e43c4329cdf7162bae48cc8af1fafd54db2fe0d17e458e1d","test/root-ca.pem":"59b9200c35e818bf21be4aaa97ba87bb6a18fd780527a9f9c51cc74212c631a0","test/rsa-encrypted.pem":"ea41b0f1816056672de6abbab43d0e8089da047c329ceed14aace5a5bde713f1","test/rsa.pem":"f866a5506ea9a37ed2f73f62f503e1aff32f7e4145be62b023535f4da1c24416","test/rsa.pem.pub":"2c5eeea39708e90396f9f09d920f2af8b7e9f84ace963c1319072224dd3d302b"},"packa ge":"a3605c298474a3aa69de92d21139fb5e2a81688! d30826235! 9d85cdd0d12a7985"} +\ No newline at end of file +--- vendor/openssl/Cargo.toml.orig 2018-09-04 07:45:22 UTC ++++ vendor/openssl/Cargo.toml +@@ -56,3 +56,4 @@ version = "0.2" + v101 = [] + v102 = [] + v110 = [] ++v111 = ["v110"] +--- vendor/openssl/build.rs.orig 2018-09-04 07:45:22 UTC ++++ vendor/openssl/build.rs +@@ -13,6 +13,10 @@ fn main() { + Ok(ref v) if v == "110" => { + println!("cargo:rustc-cfg=ossl110"); + } ++ Ok(ref v) if v == "111" => { ++ println!("cargo:rustc-cfg=ossl110"); ++ println!("cargo:rustc-cfg=ossl111"); ++ } + _ => panic!("Unable to detect OpenSSL version"), + } + +--- vendor/openssl/src/dh.rs.orig 2018-09-04 07:45:22 UTC ++++ vendor/openssl/src/dh.rs +@@ -39,7 +39,7 @@ impl Dh { + from_pem!(Dh, ffi::PEM_read_bio_DHparams); + from_der!(Dh, ffi::d2i_DHparams); + +- /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0. ++ /// Requires OpenSSL 1.0.2, 1.1.0, or 1.1.1 and the corresponding Cargo feature. + #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] + pub fn get_1024_160() -> Result<Dh, ErrorStack> { + unsafe { +@@ -48,7 +48,7 @@ impl Dh { + } + } + +- /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0. ++ /// Requires OpenSSL 1.0.2, 1.1.0, or 1.1.1 and the corresponding Cargo feature. + #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] + pub fn get_2048_224() -> Result<Dh, ErrorStack> { + unsafe { +@@ -57,7 +57,7 @@ impl Dh { + } + } + +- /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0. ++ /// Requires OpenSSL 1.0.2, 1.1.0, or 1.1.1 and the corresponding Cargo feature. + #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] + pub fn get_2048_256() -> Result<Dh, ErrorStack> { + unsafe { +--- vendor/openssl/src/pkcs5.rs.orig 2018-09-04 07:45:22 UTC ++++ vendor/openssl/src/pkcs5.rs +@@ -59,9 +59,9 @@ pub fn bytes_to_key( + ))?; + + let mut key = vec![0; len as usize]; +- let iv_ptr = iv.as_mut().map(|v| v.as_mut_ptr()).unwrap_or( +- ptr::null_mut(), +- ); ++ let iv_ptr = iv.as_mut() ++ .map(|v| v.as_mut_ptr()) ++ .unwrap_or(ptr::null_mut()); + + cvt(ffi::EVP_BytesToKey( + cipher, +@@ -107,7 +107,7 @@ pub fn pbkdf2_hmac( + + /// Derives a key from a password and salt using the scrypt algorithm. + /// +-/// Requires the `v110` feature and OpenSSL 1.1.0. ++/// Requires OpenSSL 1.1.0 or 1.1.1 and the corresponding Cargo feature. + #[cfg(all(feature = "v110", ossl110))] + pub fn scrypt( + pass: &[u8], +@@ -150,24 +150,9 @@ mod tests { + assert_eq!( + buf, + &[ +- 0x55_u8, +- 0xac_u8, +- 0x04_u8, +- 0x6e_u8, +- 0x56_u8, +- 0xe3_u8, +- 0x08_u8, +- 0x9f_u8, +- 0xec_u8, +- 0x16_u8, +- 0x91_u8, +- 0xc2_u8, +- 0x25_u8, +- 0x44_u8, +- 0xb6_u8, +- 0x05_u8, +- ] +- [..] ++ 0x55_u8, 0xac_u8, 0x04_u8, 0x6e_u8, 0x56_u8, 0xe3_u8, 0x08_u8, 0x9f_u8, 0xec_u8, ++ 0x16_u8, 0x91_u8, 0xc2_u8, 0x25_u8, 0x44_u8, 0xb6_u8, 0x05_u8, ++ ][..] + ); + + super::pbkdf2_hmac( +@@ -180,24 +165,9 @@ mod tests { + assert_eq!( + buf, + &[ +- 0x4d_u8, +- 0xdc_u8, +- 0xd8_u8, +- 0xf6_u8, +- 0x0b_u8, +- 0x98_u8, +- 0xbe_u8, +- 0x21_u8, +- 0x83_u8, +- 0x0c_u8, +- 0xee_u8, +- 0x5e_u8, +- 0xf2_u8, +- 0x27_u8, +- 0x01_u8, +- 0xf9_u8, +- ] +- [..] ++ 0x4d_u8, 0xdc_u8, 0xd8_u8, 0xf6_u8, 0x0b_u8, 0x98_u8, 0xbe_u8, 0x21_u8, 0x83_u8, ++ 0x0c_u8, 0xee_u8, 0x5e_u8, 0xf2_u8, 0x27_u8, 0x01_u8, 0xf9_u8, ++ ][..] + ); + } + +@@ -211,72 +181,15 @@ mod tests { + assert_eq!( + &buf[..], + &[ +- 0x73_u8, +- 0xde_u8, +- 0xcf_u8, +- 0xa5_u8, +- 0x8a_u8, +- 0xa2_u8, +- 0xe8_u8, +- 0x4f_u8, +- 0x94_u8, +- 0x77_u8, +- 0x1a_u8, +- 0x75_u8, +- 0x73_u8, +- 0x6b_u8, +- 0xb8_u8, +- 0x8b_u8, +- 0xd3_u8, +- 0xc7_u8, +- 0xb3_u8, +- 0x82_u8, +- 0x70_u8, +- 0xcf_u8, +- 0xb5_u8, +- 0x0c_u8, +- 0xb3_u8, +- 0x90_u8, +- 0xed_u8, +- 0x78_u8, +- 0xb3_u8, +- 0x05_u8, +- 0x65_u8, +- 0x6a_u8, +- 0xf8_u8, +- 0x14_u8, +- 0x8e_u8, +- 0x52_u8, +- 0x45_u8, +- 0x2b_u8, +- 0x22_u8, +- 0x16_u8, +- 0xb2_u8, +- 0xb8_u8, +- 0x09_u8, +- 0x8b_u8, +- 0x76_u8, +- 0x1f_u8, +- 0xc6_u8, +- 0x33_u8, +- 0x60_u8, +- 0x60_u8, +- 0xa0_u8, +- 0x9f_u8, +- 0x76_u8, +- 0x41_u8, +- 0x5e_u8, +- 0x9f_u8, +- 0x71_u8, +- 0xea_u8, +- 0x47_u8, +- 0xf9_u8, +- 0xe9_u8, ++ 0x73_u8, 0xde_u8, 0xcf_u8, 0xa5_u8, 0x8a_u8, 0xa2_u8, 0xe8_u8, 0x4f_u8, 0x94_u8, ++ 0x77_u8, 0x1a_u8, 0x75_u8, 0x73_u8, 0x6b_u8, 0xb8_u8, 0x8b_u8, 0xd3_u8, 0xc7_u8, ++ 0xb3_u8, 0x82_u8, 0x70_u8, 0xcf_u8, 0xb5_u8, 0x0c_u8, 0xb3_u8, 0x90_u8, 0xed_u8, ++ 0x78_u8, 0xb3_u8, 0x05_u8, 0x65_u8, 0x6a_u8, 0xf8_u8, 0x14_u8, 0x8e_u8, 0x52_u8, ++ 0x45_u8, 0x2b_u8, 0x22_u8, 0x16_u8, 0xb2_u8, 0xb8_u8, 0x09_u8, 0x8b_u8, 0x76_u8, ++ 0x1f_u8, 0xc6_u8, 0x33_u8, 0x60_u8, 0x60_u8, 0xa0_u8, 0x9f_u8, 0x76_u8, 0x41_u8, ++ 0x5e_u8, 0x9f_u8, 0x71_u8, 0xea_u8, 0x47_u8, 0xf9_u8, 0xe9_u8, 0x06_u8, 0x43_u8, + 0x06_u8, +- 0x43_u8, +- 0x06_u8, +- ] +- [..] ++ ][..] + ); + + super::pbkdf2_hmac( +@@ -289,72 +202,15 @@ mod tests { + assert_eq!( + &buf[..], + &[ +- 0x71_u8, +- 0xa0_u8, +- 0xec_u8, +- 0x84_u8, +- 0x2a_u8, +- 0xbd_u8, +- 0x5c_u8, +- 0x67_u8, +- 0x8b_u8, +- 0xcf_u8, +- 0xd1_u8, +- 0x45_u8, +- 0xf0_u8, +- 0x9d_u8, +- 0x83_u8, +- 0x52_u8, +- 0x2f_u8, +- 0x93_u8, +- 0x36_u8, +- 0x15_u8, +- 0x60_u8, +- 0x56_u8, +- 0x3c_u8, +- 0x4d_u8, +- 0x0d_u8, +- 0x63_u8, +- 0xb8_u8, +- 0x83_u8, +- 0x29_u8, +- 0x87_u8, +- 0x10_u8, +- 0x90_u8, +- 0xe7_u8, +- 0x66_u8, +- 0x04_u8, +- 0xa4_u8, +- 0x9a_u8, +- 0xf0_u8, +- 0x8f_u8, +- 0xe7_u8, +- 0xc9_u8, +- 0xf5_u8, +- 0x71_u8, +- 0x56_u8, +- 0xc8_u8, +- 0x79_u8, +- 0x09_u8, +- 0x96_u8, +- 0xb2_u8, +- 0x0f_u8, +- 0x06_u8, +- 0xbc_u8, +- 0x53_u8, +- 0x5e_u8, +- 0x5a_u8, +- 0xb5_u8, +- 0x44_u8, +- 0x0d_u8, +- 0xf7_u8, +- 0xe8_u8, +- 0x78_u8, +- 0x29_u8, +- 0x6f_u8, ++ 0x71_u8, 0xa0_u8, 0xec_u8, 0x84_u8, 0x2a_u8, 0xbd_u8, 0x5c_u8, 0x67_u8, 0x8b_u8, ++ 0xcf_u8, 0xd1_u8, 0x45_u8, 0xf0_u8, 0x9d_u8, 0x83_u8, 0x52_u8, 0x2f_u8, 0x93_u8, ++ 0x36_u8, 0x15_u8, 0x60_u8, 0x56_u8, 0x3c_u8, 0x4d_u8, 0x0d_u8, 0x63_u8, 0xb8_u8, ++ 0x83_u8, 0x29_u8, 0x87_u8, 0x10_u8, 0x90_u8, 0xe7_u8, 0x66_u8, 0x04_u8, 0xa4_u8, ++ 0x9a_u8, 0xf0_u8, 0x8f_u8, 0xe7_u8, 0xc9_u8, 0xf5_u8, 0x71_u8, 0x56_u8, 0xc8_u8, ++ 0x79_u8, 0x09_u8, 0x96_u8, 0xb2_u8, 0x0f_u8, 0x06_u8, 0xbc_u8, 0x53_u8, 0x5e_u8, ++ 0x5a_u8, 0xb5_u8, 0x44_u8, 0x0d_u8, 0xf7_u8, 0xe8_u8, 0x78_u8, 0x29_u8, 0x6f_u8, + 0xa7_u8, +- ] +- [..] ++ ][..] + ); + + super::pbkdf2_hmac( +@@ -367,72 +223,15 @@ mod tests { + assert_eq!( + &buf[..], + &[ +- 0x01_u8, +- 0x68_u8, +- 0x71_u8, +- 0xa4_u8, +- 0xc4_u8, +- 0xb7_u8, +- 0x5f_u8, +- 0x96_u8, +- 0x85_u8, +- 0x7f_u8, +- 0xd2_u8, +- 0xb9_u8, +- 0xf8_u8, +- 0xca_u8, +- 0x28_u8, +- 0x02_u8, +- 0x3b_u8, +- 0x30_u8, +- 0xee_u8, +- 0x2a_u8, ++ 0x01_u8, 0x68_u8, 0x71_u8, 0xa4_u8, 0xc4_u8, 0xb7_u8, 0x5f_u8, 0x96_u8, 0x85_u8, ++ 0x7f_u8, 0xd2_u8, 0xb9_u8, 0xf8_u8, 0xca_u8, 0x28_u8, 0x02_u8, 0x3b_u8, 0x30_u8, ++ 0xee_u8, 0x2a_u8, 0x39_u8, 0xf5_u8, 0xad_u8, 0xca_u8, 0xc8_u8, 0xc9_u8, 0x37_u8, ++ 0x5f_u8, 0x9b_u8, 0xda_u8, 0x1c_u8, 0xcd_u8, 0x1b_u8, 0x6f_u8, 0x0b_u8, 0x2f_u8, ++ 0xc3_u8, 0xad_u8, 0xda_u8, 0x50_u8, 0x54_u8, 0x12_u8, 0xe7_u8, 0x9d_u8, 0x89_u8, ++ 0x00_u8, 0x56_u8, 0xc6_u8, 0x2e_u8, 0x52_u8, 0x4c_u8, 0x7d_u8, 0x51_u8, 0x15_u8, ++ 0x4b_u8, 0x1a_u8, 0x85_u8, 0x34_u8, 0x57_u8, 0x5b_u8, 0xd0_u8, 0x2d_u8, 0xee_u8, + 0x39_u8, +- 0xf5_u8, +- 0xad_u8, +- 0xca_u8, +- 0xc8_u8, +- 0xc9_u8, +- 0x37_u8, +- 0x5f_u8, +- 0x9b_u8, +- 0xda_u8, +- 0x1c_u8, +- 0xcd_u8, +- 0x1b_u8, +- 0x6f_u8, +- 0x0b_u8, +- 0x2f_u8, +- 0xc3_u8, +- 0xad_u8, +- 0xda_u8, +- 0x50_u8, +- 0x54_u8, +- 0x12_u8, +- 0xe7_u8, +- 0x9d_u8, +- 0x89_u8, +- 0x00_u8, +- 0x56_u8, +- 0xc6_u8, +- 0x2e_u8, +- 0x52_u8, +- 0x4c_u8, +- 0x7d_u8, +- 0x51_u8, +- 0x15_u8, +- 0x4b_u8, +- 0x1a_u8, +- 0x85_u8, +- 0x34_u8, +- 0x57_u8, +- 0x5b_u8, +- 0xd0_u8, +- 0x2d_u8, +- 0xee_u8, +- 0x39_u8, +- ] +- [..] ++ ][..] + ); + } + +@@ -441,93 +240,19 @@ mod tests { + let salt = [16_u8, 34_u8, 19_u8, 23_u8, 141_u8, 4_u8, 207_u8, 221_u8]; + + let data = [ +- 143_u8, +- 210_u8, +- 75_u8, +- 63_u8, +- 214_u8, +- 179_u8, +- 155_u8, +- 241_u8, +- 242_u8, +- 31_u8, +- 154_u8, +- 56_u8, +- 198_u8, +- 145_u8, +- 192_u8, +- 64_u8, +- 2_u8, +- 245_u8, +- 167_u8, +- 220_u8, +- 55_u8, +- 119_u8, +- 233_u8, +- 136_u8, +- 139_u8, +- 27_u8, +- 71_u8, +- 242_u8, +- 119_u8, +- 175_u8, +- 65_u8, +- 207_u8, ++ 143_u8, 210_u8, 75_u8, 63_u8, 214_u8, 179_u8, 155_u8, 241_u8, 242_u8, 31_u8, 154_u8, ++ 56_u8, 198_u8, 145_u8, 192_u8, 64_u8, 2_u8, 245_u8, 167_u8, 220_u8, 55_u8, 119_u8, ++ 233_u8, 136_u8, 139_u8, 27_u8, 71_u8, 242_u8, 119_u8, 175_u8, 65_u8, 207_u8, + ]; + +- +- + let expected_key = vec![ +- 249_u8, +- 115_u8, +- 114_u8, +- 97_u8, +- 32_u8, +- 213_u8, +- 165_u8, +- 146_u8, +- 58_u8, +- 87_u8, +- 234_u8, +- 3_u8, +- 43_u8, +- 250_u8, +- 97_u8, +- 114_u8, +- 26_u8, +- 98_u8, +- 245_u8, +- 246_u8, +- 238_u8, +- 177_u8, +- 229_u8, +- 161_u8, +- 183_u8, +- 224_u8, +- 174_u8, +- 3_u8, +- 6_u8, +- 244_u8, +- 236_u8, +- 255_u8, ++ 249_u8, 115_u8, 114_u8, 97_u8, 32_u8, 213_u8, 165_u8, 146_u8, 58_u8, 87_u8, 234_u8, ++ 3_u8, 43_u8, 250_u8, 97_u8, 114_u8, 26_u8, 98_u8, 245_u8, 246_u8, 238_u8, 177_u8, ++ 229_u8, 161_u8, 183_u8, 224_u8, 174_u8, 3_u8, 6_u8, 244_u8, 236_u8, 255_u8, + ]; + let expected_iv = vec![ +- 4_u8, +- 223_u8, +- 153_u8, +- 219_u8, +- 28_u8, +- 142_u8, +- 234_u8, +- 68_u8, +- 227_u8, +- 69_u8, +- 98_u8, +- 107_u8, +- 208_u8, +- 14_u8, +- 236_u8, +- 60_u8, ++ 4_u8, 223_u8, 153_u8, 219_u8, 28_u8, 142_u8, 234_u8, 68_u8, 227_u8, 69_u8, 98_u8, ++ 107_u8, 208_u8, 14_u8, 236_u8, 60_u8, + ]; + + assert_eq!( +@@ -552,8 +277,9 @@ mod tests { + + let pass = "pleaseletmein"; + let salt = "SodiumChloride"; +- let expected = "7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d5432955613\ +- f0fcf62d49705242a9af9e61e85dc0d651e40dfcf017b45575887"; ++ let expected = ++ "7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d5432955613\ ++ f0fcf62d49705242a9af9e61e85dc0d651e40dfcf017b45575887"; + + let mut actual = [0; 64]; + super::scrypt( +--- vendor/openssl/src/ssl/connector.rs.orig 2018-09-04 07:45:22 UTC ++++ vendor/openssl/src/ssl/connector.rs +@@ -3,6 +3,8 @@ use std::ops::{Deref, DerefMut}; + + use dh::Dh; + use error::ErrorStack; ++#[cfg(ossl111)] ++use ssl::SslOption; + use ssl::{self, HandshakeError, Ssl, SslRef, SslContext, SslContextBuilder, SslMethod, SslStream, + SSL_VERIFY_PEER}; + use pkey::PKeyRef; +@@ -271,6 +273,12 @@ impl SslAcceptorBuilder { + /// Like `mozilla_intermediate`, but does not load the certificate chain and private key. + pub fn mozilla_intermediate_raw(method: SslMethod) -> Result<SslAcceptorBuilder, ErrorStack> { + let mut ctx = ctx(method)?; ++ #[cfg(ossl111)] ++ { ++ ctx.set_options(SslOption { ++ bits: ::ffi::SSL_OP_NO_TLSv1_3, ++ }); ++ } + let dh = Dh::from_pem(DHPARAM_PEM.as_bytes())?; + ctx.set_tmp_dh(&dh)?; + setup_curves(&mut ctx)?; +@@ -292,6 +300,13 @@ impl SslAcceptorBuilder { + /// Like `mozilla_modern`, but does not load the certificate chain and private key. + pub fn mozilla_modern_raw(method: SslMethod) -> Result<SslAcceptorBuilder, ErrorStack> { + let mut ctx = ctx(method)?; ++ ctx.set_options(ssl::SSL_OP_NO_TLSV1 | ssl::SSL_OP_NO_TLSV1_1); ++ #[cfg(ossl111)] ++ { ++ ctx.set_options(SslOption { ++ bits: ::ffi::SSL_OP_NO_TLSv1_3, ++ }); ++ } + setup_curves(&mut ctx)?; + ctx.set_cipher_list( + "ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:\ +--- vendor/openssl/src/ssl/mod.rs.orig 2018-09-04 07:45:22 UTC ++++ vendor/openssl/src/ssl/mod.rs +@@ -211,14 +211,20 @@ bitflags! { + /// Disables the use of TLSv1.2. + const SSL_OP_NO_TLSV1_2 = ffi::SSL_OP_NO_TLSv1_2; + ++ /// Disables the use of TLSv1.3. ++ /// ++ /// Requires the `v111` feature and OpenSSL 1.1.1. ++ #[cfg(all(feature = "v111", ossl111))] ++ const NO_TLSV1_3 = ffi::SSL_OP_NO_TLSv1_3; ++ + /// Disables the use of DTLSv1.0 + /// +- /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0. ++ /// Requires OpenSSL 1.0.2, 1.1.0, or 1.1.1 and the corresponding Cargo feature. + #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] + const SSL_OP_NO_DTLSV1 = ffi::SSL_OP_NO_DTLSv1; + + /// Disables the use of DTLSv1.2. +- /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0. ++ /// Requires OpenSSL 1.0.2, 1.1.0, or 1.1.1 and the corresponding Cargo feature. + #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] + const SSL_OP_NO_DTLSV1_2 = ffi::SSL_OP_NO_DTLSv1_2; + +@@ -226,7 +232,7 @@ bitflags! { + /// + /// This can be used as a mask when whitelisting protocol versions. + /// +- /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0. ++ /// Requires OpenSSL 1.0.2, 1.1.0, or 1.1.1 and the corresponding Cargo feature. + /// + /// # Examples + /// +@@ -573,7 +579,7 @@ impl SslContextBuilder { + + /// Sets a custom certificate store for verifying peer certificates. + /// +- /// Requires the `v102` feature and OpenSSL 1.0.2, or the `v110` feature and OpenSSL 1.1.0. ++ /// Requires OpenSSL 1.0.2, 1.1.0, or 1.1.1 and the corresponding Cargo feature. + /// + /// This corresponds to [`SSL_CTX_set0_verify_cert_store`]. + /// +@@ -582,8 +588,7 @@ impl SslContextBuilder { + pub fn set_verify_cert_store(&mut self, cert_store: X509Store) -> Result<(), ErrorStack> { + unsafe { + let ptr = cert_store.as_ptr(); +- cvt(ffi::SSL_CTX_set0_verify_cert_store(self.as_ptr(), ptr) +- as c_int)?; ++ cvt(ffi::SSL_CTX_set0_verify_cert_store(self.as_ptr(), ptr) as c_int)?; + mem::forget(cert_store); + + Ok(()) +@@ -613,8 +618,8 @@ impl SslContextBuilder { + /// [`SSL_CTX_set_mode`]: https://www.openssl.org/docs/man1.0.2/ssl/SSL_CTX_set_mode.html + pub fn set_mode(&mut self, mode: SslMode) -> SslMode { + unsafe { +- let mode = ffi::SSL_CTX_set_mode(self.as_ptr(), mode.bits()); +- SslMode::from_bits(mode).unwrap() ++ let bits = ffi::SSL_CTX_set_mode(self.as_ptr(), mode.bits()); ++ SslMode { bits } + } + } + +@@ -657,11 +662,7 @@ impl SslContextBuilder { + /// + /// This corresponds to `SSL_CTX_set_tmp_ecdh`. + pub fn set_tmp_ecdh(&mut self, key: &EcKeyRef) -> Result<(), ErrorStack> { +- unsafe { +- cvt(ffi::SSL_CTX_set_tmp_ecdh(self.as_ptr(), key.as_ptr()) +- as c_int) +- .map(|_| ()) +- } ++ unsafe { cvt(ffi::SSL_CTX_set_tmp_ecdh(self.as_ptr(), key.as_ptr()) as c_int).map(|_| ()) } + } + + /// Sets the callback which will generate parameters to be used during ephemeral elliptic curve +@@ -901,8 +902,8 @@ impl SslContextBuilder { + /// + /// [`SSL_CTX_set_options`]: https://www.openssl.org/docs/manmaster/man3/SSL_CTX_set_options.html + pub fn set_options(&mut self, option: SslOption) -> SslOption { +- let ret = unsafe { compat::SSL_CTX_set_options(self.as_ptr(), option.bits()) }; +- SslOption::from_bits(ret).unwrap() ++ let bits = unsafe { compat::SSL_CTX_set_options(self.as_ptr(), option.bits()) }; ++ SslOption { bits } + } + + /// Returns the options used by the context. +@@ -911,8 +912,8 @@ impl SslContextBuilder { + /// + /// [`SSL_CTX_get_options`]: https://www.openssl.org/docs/manmaster/man3/SSL_CTX_set_options.html + pub fn options(&self) -> SslOption { +- let ret = unsafe { compat::SSL_CTX_get_options(self.as_ptr()) }; +- SslOption::from_bits(ret).unwrap() ++ let bits = unsafe { compat::SSL_CTX_get_options(self.as_ptr()) }; ++ SslOption { bits } + } + + /// Clears the options used by the context, returning the old set. +@@ -921,8 +922,8 @@ impl SslContextBuilder { + /// + /// [`SSL_CTX_clear_options`]: https://www.openssl.org/docs/manmaster/man3/SSL_CTX_set_options.html + pub fn clear_options(&mut self, option: SslOption) -> SslOption { +- let ret = unsafe { compat::SSL_CTX_clear_options(self.as_ptr(), option.bits()) }; +- SslOption::from_bits(ret).unwrap() ++ let bits = unsafe { compat::SSL_CTX_clear_options(self.as_ptr(), option.bits()) }; ++ SslOption { bits } + } + + /// Set the protocols to be used during Next Protocol Negotiation (the protocols +@@ -968,7 +969,7 @@ impl SslContextBuilder { + /// + /// Note that ordering of the protocols controls the priority with which they are chosen. + /// +- /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0. ++ /// Requires OpenSSL 1.0.2, 1.1.0, or 1.1.1 and the corresponding Cargo feature. + // FIXME overhaul + #[cfg(any(all(feature = "v102", ossl102), all(feature = "v110", ossl110)))] + pub fn set_alpn_protocols(&mut self, protocols: &[&[u8]]) -> Result<(), ErrorStack> { +@@ -1059,9 +1060,7 @@ impl SslContextBuilder { + Box::into_raw(callback) as *mut c_void, + ); + let f: unsafe extern "C" fn(_, _) -> _ = raw_tlsext_status::<F>; +- cvt(ffi::SSL_CTX_set_tlsext_status_cb(self.as_ptr(), Some(f)) +- as c_int) +- .map(|_| ()) ++ cvt(ffi::SSL_CTX_set_tlsext_status_cb(self.as_ptr(), Some(f)) as c_int).map(|_| ()) + } + } + +@@ -1185,7 +1184,7 @@ impl SslContext { + impl SslContextRef { + /// Returns the certificate associated with this `SslContext`, if present. + /// +- /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0. ++ /// Requires OpenSSL 1.0.2, 1.1.0, or 1.1.1 and the corresponding Cargo feature. + /// + /// This corresponds to [`SSL_CTX_get0_certificate`]. + /// +@@ -1204,7 +1203,7 @@ impl SslContextRef { + + /// Returns the private key associated with this `SslContext`, if present. + /// +- /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0. ++ /// Requires OpenSSL 1.0.2, 1.1.0, or 1.1.1 and the corresponding Cargo feature. + /// + /// This corresponds to [`SSL_CTX_get0_privatekey`]. + /// +@@ -1789,7 +1788,7 @@ impl SslRef { + /// The protocol's name is returned is an opaque sequence of bytes. It is up to the client + /// to interpret it. + /// +- /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or OpenSSL 1.1.0. ++ /// Requires OpenSSL 1.0.2, 1.1.0, or 1.1.1 and the corresponding Cargo feature. + /// + /// This corresponds to [`SSL_get0_alpn_selected`]. + /// +@@ -1889,7 +1888,7 @@ impl SslRef { + + /// Returns a mutable reference to the X509 verification configuration. + /// +- /// Requires the `v102` or `v110` features and OpenSSL 1.0.2 or 1.1.0. ++ /// Requires OpenSSL 1.0.2, 1.1.0, or 1.1.1 and the corresponding Cargo feature. + /// + /// This corresponds to [`SSL_get0_param`]. + /// +--- vendor/openssl/src/ssl/tests/mod.rs.orig 2018-09-04 07:45:22 UTC ++++ vendor/openssl/src/ssl/tests/mod.rs +@@ -1084,7 +1084,7 @@ fn connector_no_hostname_can_disable_verify() { + + #[test] + fn connector_client_server_mozilla_intermediate() { +- let listener = TcpListener::bind("127.0.0.1:0").unwrap(); ++ let listener = TcpListener::bind("127.0.0.1:1234").unwrap(); + let port = listener.local_addr().unwrap().port(); + + let t = thread::spawn(move || { +@@ -1231,6 +1231,13 @@ fn tmp_dh_callback() { + + let stream = TcpStream::connect(("127.0.0.1", port)).unwrap(); + let mut ctx = SslContext::builder(SslMethod::tls()).unwrap(); ++ // TLS 1.3 has no DH suites, and openssl isn't happy if the max version has no suites :( ++ #[cfg(ossl111)] ++ { ++ ctx.set_options(super::SslOption { ++ bits: ::ffi::SSL_OP_NO_TLSv1_3, ++ }); ++ } + ctx.set_cipher_list("EDH").unwrap(); + let ssl = Ssl::new(&ctx.build()).unwrap(); + ssl.connect(stream).unwrap(); +@@ -1298,6 +1305,13 @@ fn tmp_dh_callback_ssl() { + + let stream = TcpStream::connect(("127.0.0.1", port)).unwrap(); + let mut ctx = SslContext::builder(SslMethod::tls()).unwrap(); ++ // TLS 1.3 has no DH suites, and openssl isn't happy if the max version has no suites :( ++ #[cfg(ossl111)] ++ { ++ ctx.set_options(super::SslOption { ++ bits: ::ffi::SSL_OP_NO_TLSv1_3, ++ }); ++ } + ctx.set_cipher_list("EDH").unwrap(); + let ssl = Ssl::new(&ctx.build()).unwrap(); + ssl.connect(stream).unwrap(); +--- vendor/openssl/src/symm.rs.orig 2018-09-04 07:45:22 UTC ++++ vendor/openssl/src/symm.rs +@@ -137,13 +137,13 @@ impl Cipher { + unsafe { Cipher(ffi::EVP_rc4()) } + } + +- /// Requires the `v110` feature and OpenSSL 1.1.0. ++ /// Requires OpenSSL 1.1.0 or 1.1.1 and the corresponding Cargo feature. + #[cfg(all(ossl110, feature = "v110"))] + pub fn chacha20() -> Cipher { + unsafe { Cipher(ffi::EVP_chacha20()) } + } + +- /// Requires the `v110` feature and OpenSSL 1.1.0. ++ /// Requires OpenSSL 1.1.0 or 1.1.1 and the corresponding Cargo feature. + #[cfg(all(ossl110, feature = "v110"))] + pub fn chacha20_poly1305() -> Cipher { + unsafe { Cipher(ffi::EVP_chacha20_poly1305()) } +@@ -167,7 +167,11 @@ impl Cipher { + pub fn iv_len(&self) -> Option<usize> { + unsafe { + let len = EVP_CIPHER_iv_length(self.0) as usize; +- if len == 0 { None } else { Some(len) } ++ if len == 0 { ++ None ++ } else { ++ Some(len) ++ } + } + } + +@@ -590,7 +594,7 @@ pub fn decrypt_aead( + } + + #[cfg(ossl110)] +-use ffi::{EVP_CIPHER_iv_length, EVP_CIPHER_block_size, EVP_CIPHER_key_length}; ++use ffi::{EVP_CIPHER_block_size, EVP_CIPHER_iv_length, EVP_CIPHER_key_length}; + + #[cfg(ossl10x)] + #[allow(bad_style)] +@@ -623,74 +627,17 @@ mod tests { + #[test] + fn test_aes_256_ecb() { + let k0 = [ +- 0x00u8, +- 0x01u8, +- 0x02u8, +- 0x03u8, +- 0x04u8, +- 0x05u8, +- 0x06u8, +- 0x07u8, +- 0x08u8, +- 0x09u8, +- 0x0au8, +- 0x0bu8, +- 0x0cu8, +- 0x0du8, +- 0x0eu8, +- 0x0fu8, +- 0x10u8, +- 0x11u8, +- 0x12u8, +- 0x13u8, +- 0x14u8, +- 0x15u8, +- 0x16u8, +- 0x17u8, +- 0x18u8, +- 0x19u8, +- 0x1au8, +- 0x1bu8, +- 0x1cu8, +- 0x1du8, +- 0x1eu8, +- 0x1fu8, ++ 0x00u8, 0x01u8, 0x02u8, 0x03u8, 0x04u8, 0x05u8, 0x06u8, 0x07u8, 0x08u8, 0x09u8, 0x0au8, ++ 0x0bu8, 0x0cu8, 0x0du8, 0x0eu8, 0x0fu8, 0x10u8, 0x11u8, 0x12u8, 0x13u8, 0x14u8, 0x15u8, ++ 0x16u8, 0x17u8, 0x18u8, 0x19u8, 0x1au8, 0x1bu8, 0x1cu8, 0x1du8, 0x1eu8, 0x1fu8, + ]; + let p0 = [ +- 0x00u8, +- 0x11u8, +- 0x22u8, +- 0x33u8, +- 0x44u8, +- 0x55u8, +- 0x66u8, +- 0x77u8, +- 0x88u8, +- 0x99u8, +- 0xaau8, +- 0xbbu8, +- 0xccu8, +- 0xddu8, +- 0xeeu8, +- 0xffu8, ++ 0x00u8, 0x11u8, 0x22u8, 0x33u8, 0x44u8, 0x55u8, 0x66u8, 0x77u8, 0x88u8, 0x99u8, 0xaau8, ++ 0xbbu8, 0xccu8, 0xddu8, 0xeeu8, 0xffu8, + ]; + let c0 = [ +- 0x8eu8, +- 0xa2u8, +- 0xb7u8, +- 0xcau8, +- 0x51u8, +- 0x67u8, +- 0x45u8, +- 0xbfu8, +- 0xeau8, +- 0xfcu8, +- 0x49u8, +- 0x90u8, +- 0x4bu8, +- 0x49u8, +- 0x60u8, +- 0x89u8, ++ 0x8eu8, 0xa2u8, 0xb7u8, 0xcau8, 0x51u8, 0x67u8, 0x45u8, 0xbfu8, 0xeau8, 0xfcu8, 0x49u8, ++ 0x90u8, 0x4bu8, 0x49u8, 0x60u8, 0x89u8, + ]; + let mut c = super::Crypter::new( + super::Cipher::aes_256_ecb(), +@@ -722,74 +669,17 @@ mod tests { + #[test] + fn test_aes_256_cbc_decrypt() { + let iv = [ +- 4_u8, +- 223_u8, +- 153_u8, +- 219_u8, +- 28_u8, +- 142_u8, +- 234_u8, +- 68_u8, +- 227_u8, +- 69_u8, +- 98_u8, +- 107_u8, +- 208_u8, +- 14_u8, +- 236_u8, +- 60_u8, ++ 4_u8, 223_u8, 153_u8, 219_u8, 28_u8, 142_u8, 234_u8, 68_u8, 227_u8, 69_u8, 98_u8, ++ 107_u8, 208_u8, 14_u8, 236_u8, 60_u8, + ]; + let data = [ +- 143_u8, +- 210_u8, +- 75_u8, +- 63_u8, +- 214_u8, +- 179_u8, +- 155_u8, +- 241_u8, +- 242_u8, +- 31_u8, +- 154_u8, +- 56_u8, +- 198_u8, +- 145_u8, +- 192_u8, +- 64_u8, +- 2_u8, +- 245_u8, +- 167_u8, +- 220_u8, +- 55_u8, +- 119_u8, +- 233_u8, +- 136_u8, +- 139_u8, +- 27_u8, +- 71_u8, +- 242_u8, +- 119_u8, +- 175_u8, +- 65_u8, +- 207_u8, ++ 143_u8, 210_u8, 75_u8, 63_u8, 214_u8, 179_u8, 155_u8, 241_u8, 242_u8, 31_u8, 154_u8, ++ 56_u8, 198_u8, 145_u8, 192_u8, 64_u8, 2_u8, 245_u8, 167_u8, 220_u8, 55_u8, 119_u8, ++ 233_u8, 136_u8, 139_u8, 27_u8, 71_u8, 242_u8, 119_u8, 175_u8, 65_u8, 207_u8, + ]; + let ciphered_data = [ +- 0x4a_u8, +- 0x2e_u8, +- 0xe5_u8, +- 0x6_u8, +- 0xbf_u8, +- 0xcf_u8, +- 0xf2_u8, +- 0xd7_u8, +- 0xea_u8, +- 0x2d_u8, +- 0xb1_u8, +- 0x85_u8, +- 0x6c_u8, +- 0x93_u8, +- 0x65_u8, +- 0x6f_u8, ++ 0x4a_u8, 0x2e_u8, 0xe5_u8, 0x6_u8, 0xbf_u8, 0xcf_u8, 0xf2_u8, 0xd7_u8, 0xea_u8, ++ 0x2d_u8, 0xb1_u8, 0x85_u8, 0x6c_u8, 0x93_u8, 0x65_u8, 0x6f_u8, + ]; + let mut cr = super::Crypter::new( + super::Cipher::aes_256_cbc(), +@@ -864,7 +754,6 @@ mod tests { + + #[test] + fn test_rc4() { +- + let pt = "0000000000000000000000000000000000000000000000000000000000000000000000000000"; + let ct = "A68686B04D686AA107BD8D4CAB191A3EEC0A6294BC78B60F65C25CB47BD7BB3A48EFC4D26BE4"; + let key = "97CD440324DA5FD1F7955C1C13B6B466"; +@@ -890,7 +779,6 @@ mod tests { + + #[test] + fn test_aes128_ctr() { +- + let pt = "6BC1BEE22E409F96E93D7E117393172AAE2D8A571E03AC9C9EB76FAC45AF8E5130C81C46A35CE411\ + E5FBC1191A0A52EFF69F2445DF4F9B17AD2B417BE66C3710"; + let ct = "874D6191B620E3261BEF6864990DB6CE9806F66B7970FDFF8617187BB9FFFDFF5AE4DF3EDBD5D35E\ +@@ -915,7 +803,6 @@ mod tests { + + #[test] + fn test_aes128_cfb128() { +- + let pt = "6bc1bee22e409f96e93d7e117393172a"; + let ct = "3b3fd92eb72dad20333449f8e83cfb4a"; + let key = "2b7e151628aed2a6abf7158809cf4f3c"; +@@ -926,7 +813,6 @@ mod tests { + + #[test] + fn test_aes128_cfb8() { +- + let pt = "6bc1bee22e409f96e93d7e117393172aae2d"; + let ct = "3b79424c9c0dd436bace9e0ed4586a4f32b9"; + let key = "2b7e151628aed2a6abf7158809cf4f3c"; +@@ -937,7 +823,6 @@ mod tests { + + #[test] + fn test_aes256_cfb1() { +- + let pt = "6bc1"; + let ct = "9029"; + let key = "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"; +@@ -948,7 +833,6 @@ mod tests { + + #[test] + fn test_aes256_cfb128() { +- + let pt = "6bc1bee22e409f96e93d7e117393172a"; + let ct = "dc7e84bfda79164b7ecd8486985d3860"; + let key = "603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4"; +@@ -959,7 +843,6 @@ mod tests { + + #[test] + fn test_aes256_cfb8() { +- + let pt = "6bc1bee22e409f96e93d7e117393172aae2d"; + let ct = "dc1f1a8520a64db55fcc8ac554844e889700"; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811211506.wALF6QQx087881>