722bdb6a4c
Merge pull request #550 from Keruspe/master
...
LibreSSL support improvements
2017-01-22 18:39:34 +00:00
1ffdf8a1ab
Fix test warnings
2017-01-21 14:43:43 +00:00
920ab0d6fb
OCSP functionality
2017-01-14 21:09:38 -08:00
1fbe8f8d71
Fix typo
2017-01-08 11:04:47 -08:00
1942977408
Add methods to construct SslAcceptorBuilder without key and cert
...
This will allow, in particular, initialization directly from files
rather than having to load and parse them manually.
2017-01-08 10:57:04 -08:00
0978f87095
libressl: make set_ecdh_auto available
...
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
2017-01-05 20:47:01 +01:00
404e0341d8
Provide master key access
2017-01-04 22:01:30 -08:00
a2c118bf82
Add basic session tests
2017-01-04 21:18:13 -08:00
0b1bfee46d
session is nullable
2017-01-04 21:15:09 -08:00
5d53405597
Provide access to the session ID
2017-01-04 21:11:06 -08:00
88a7032f4b
Types and accessor for SslSession
2017-01-04 20:59:46 -08:00
cfb2539ed4
Typo
2017-01-02 09:37:31 -08:00
0e0bee50a5
Clean up bio
2017-01-01 10:18:43 -08:00
7e035a7fd1
Merge pull request #538 from semarie/libressl
...
Add LibreSSL support
2016-12-22 11:59:19 -05:00
b3526cbd2b
Add LibreSSL 2.5.0 support
2016-12-21 09:27:12 +01:00
8e01f8d250
Handle zero-length reads/writes
...
This commit adds some short-circuits for zero-length reads/writes to
`SslStream`. Because OpenSSL returns 0 on error, then we could mistakenly
confuse a 0-length success as an actual error, so we avoid writing or reading 0
bytes by returning quickly with a success.
2016-12-20 15:52:18 -08:00
146512099b
Implement Clone for SslConnector and SslAcceptor
2016-11-27 21:35:35 -08:00
234f126d7d
Cleanup
2016-11-27 21:00:59 -08:00
6794a45d60
Rename ec_key to ec
2016-11-14 22:37:01 +01:00
0d0b5080e2
Rename new_by_curve_name to from_curve_name
2016-11-13 20:21:44 +00:00
85c1474ce6
No need to use a raw string anymore
2016-11-13 12:19:31 +00:00
64e9932ac9
Use ffdhe2048 in mozilla_intermediate
2016-11-12 17:52:58 +00:00
2f8301fc63
Be a bit more emphatic about the danger
2016-11-12 16:51:26 +00:00
6b3599d319
Add a connect method that does not perform hostname verification
...
The method name is intentionally painful to type to discourage its use
2016-11-12 16:45:18 +00:00
7cdb58bc47
Simplify test logic a bit
2016-11-12 14:42:48 +00:00
96d24c8957
Add SslRef::set_{tmp_dh,tmp_ecdh,ecdh_auto}
2016-11-12 13:45:54 +00:00
2a1d7b2bcb
Pick different cipher lists on 1.0.1 and 1.0.2
2016-11-12 13:36:03 +00:00
93253ba599
Adjust cipher lists to work on older versions
2016-11-12 13:09:12 +00:00
780c46e0e7
Add SslRef::set_tmp_{ec,}dh_calback
2016-11-12 12:56:58 +00:00
563754fb08
Add SslContextBuilder::set_tmp_{ec,}dh_callback
2016-11-12 12:43:44 +00:00
26a3358a2b
Add basic X509_STORE access
...
There's more to do here, but this enabled addition of trusted CAs from
X509 objects.
Closes #394
2016-11-12 00:24:12 +00:00
898e7f02df
Fix EOF detection
...
See https://github.com/openssl/openssl/issues/1903 for details
2016-11-11 15:10:30 +00:00
a42c6e8713
Drop rustc-serialize dependency
2016-11-09 20:35:23 +00:00
aa7c27536a
Make sure to override SslContext verify callback always
...
The 1.0.1 code has to override this to setup hostname validation, and
don't want behavior to silently change depending on the OpenSSL version
you're building against.
2016-11-08 22:38:48 +00:00
597d05b8f8
Add stack creation and push
2016-11-06 23:46:42 -08:00
1edb6f682e
Support client CA advertisement
2016-11-06 12:17:14 -08:00
a4e0581e4f
Fix build on 1.0.1
2016-11-06 11:57:50 -08:00
bcb7b3f5dc
Add accessors for cert and private key
...
Closes #340
2016-11-06 10:46:38 -08:00
79e2004eef
Fixes
2016-11-05 19:28:17 -07:00
f15c817c2d
Rustfmt
2016-11-05 10:54:17 -07:00
99b41a0050
Rename accessors
2016-11-05 10:15:40 -07:00
01ae978db0
Get rid of Ref
...
There's unfortunately a rustdoc bug that causes all methods implemented
for any Ref<T> to be inlined in the deref methods section :(
2016-11-04 17:16:59 -07:00
6fe7dd3024
Remove an enum
2016-11-03 22:45:54 -07:00
aa0040125b
Use built in DH parameters when available
...
Fall back to a hardcoded PEM blob on 1.0.1, but serialized from
DH_get_2048_256.
2016-11-01 22:50:22 -07:00
36bf0bb387
Replace GeneralNames by the new Stack API
2016-11-01 21:23:18 +01:00
f71395c600
Little cfg cleanup
2016-10-31 22:45:51 -07:00
dc4098bdd8
Clean up x509 name entries
2016-10-31 22:43:05 -07:00
cd7fa9fca2
Update x509
2016-10-31 20:54:34 -07:00
ff12d37aef
Update ssl
2016-10-31 20:32:55 -07:00
16e398e005
Update verify
2016-10-31 20:19:59 -07:00
f640613863
Update PKey
2016-10-31 20:12:55 -07:00
d6579ab058
Update EcKey
2016-10-31 20:06:06 -07:00
28f375974a
Convert Dh
2016-10-31 20:02:24 -07:00
006da59285
Return an SslRef
2016-10-30 22:42:32 -07:00
558124b755
Expose SSL_MODEs
2016-10-30 22:02:26 -07:00
e0211dac30
Rename set_CA_file
2016-10-30 21:39:26 -07:00
5b0fc9a185
Impl Sync and Send for SslContextBuilder
2016-10-30 20:34:35 -07:00
add8e4023e
Rename connectors
2016-10-30 19:39:18 -07:00
997e92e052
Merge ssl option setup
...
The client will ignore server-side options so we may as well stick them
all in the same spot.
2016-10-30 18:49:29 -07:00
bd457dba18
Move HandshakeError to submodule
2016-10-30 17:23:03 -07:00
f75f82e466
Rustfmt
2016-10-30 16:37:45 -07:00
7869651407
Remove out of date comment
2016-10-30 16:34:50 -07:00
9abbf6f80e
Use Python's cipher list on the client side.
2016-10-30 16:29:33 -07:00
d1179f1ad2
Update docs
2016-10-30 15:14:29 -07:00
52f288e090
Add a mozilla modern profile
2016-10-30 14:57:22 -07:00
7d13176cd1
Rename nwe to mozilla_intermediate
2016-10-30 14:34:05 -07:00
43b430e5b0
Pass SslMethod into constructors
2016-10-30 14:26:28 -07:00
ee79db61c2
Enable single ECDH use
2016-10-30 13:41:24 -07:00
677718f8da
Configure ECDH parameters in connector
2016-10-30 13:38:09 -07:00
eb735f519a
Clean up generics a bit
2016-10-30 11:05:29 -07:00
23fe1e85e9
Pull Curl's CA list for Windows tests
2016-10-29 18:17:46 -07:00
761dd780c1
Add module level docs
2016-10-29 18:04:38 -07:00
e72533c058
Docs for connectors
2016-10-29 15:00:46 -07:00
57d10ebbc3
Add PKeyRef
2016-10-29 14:19:09 -07:00
4c7a5a418e
Implement client and server connectors
2016-10-29 14:02:26 -07:00
dafb46fc51
Camel case DH
2016-10-27 20:26:18 -07:00
781417d50f
Add a macro definition
2016-10-27 19:12:55 -07:00
8e129af256
Fix description
2016-10-26 22:15:41 -07:00
63b1ec1a12
Stop returning an Option from cipher description
2016-10-26 22:13:10 -07:00
ebc4c56c34
Add SslMethod::from_ptr
2016-10-26 20:43:43 -07:00
f4b7006771
Don't allow mutation of SslContexts
...
SslContext is reference counted and the various setter methods don't
take out locks where necessary. Fix this by adding a builder for the
context.
2016-10-25 23:12:56 -07:00
39279455c8
Add a shutdown method
2016-10-25 20:40:18 -07:00
eb655bddbc
Fix ordering
2016-10-25 20:01:28 -07:00
938fdd7137
Add into_error
2016-10-23 21:54:49 -07:00
ca71e00878
Fix Send + Sync-ness of SslStream
2016-10-23 20:55:31 -07:00
98b7f2f935
Flatten crypto module
2016-10-22 09:16:38 -07:00
9be0aab9ac
Borrow compression string
2016-10-21 21:46:32 -07:00
f1c68e3544
Rename SslContextOptions
2016-10-21 21:22:05 -07:00
8ec53eb0e1
Fix X509StoreContext
2016-10-21 20:59:07 -07:00
02b4385c5d
Convert X509VerifyParamRef
2016-10-21 19:58:06 -07:00
f0cde38929
Borrowed servername
2016-10-21 19:54:30 -07:00
fcb86b8394
Convert SslCipherRef
2016-10-21 19:45:46 -07:00
2bbeddd14a
Convert SslRef
2016-10-21 19:33:56 -07:00
fe98a90719
Convert SslContextRef
2016-10-21 19:15:09 -07:00
bd0c0c60bd
Store a MidHandshakeSslStream in fatal errors
...
This in particular allows the X509 verification error to be retrieved,
as well as the stream itself.
2016-10-20 20:57:53 -07:00
8f3511c0cd
Redo SslStream construction
...
SslStream is now constructed via methods on Ssl. You realistically want
to create an Ssl for SNI and hostname verification so making it harder
to construct a stream directly from an SslContext is a good thing.
2016-10-20 19:59:09 -07:00
5ab037f056
Allow the X509 verify error to be read from an SslRef
2016-10-18 22:21:06 -07:00
c4459c37d9
Callback cleanup
2016-10-18 21:13:13 -07:00
f7e6d7fce6
Don't ignore errors in NPN/ALPN logic
...
Closes #479
2016-10-18 21:12:55 -07:00
194298a057
Implement new feature setup
...
The basic idea here is that there is a feature for each supported
OpenSSL version. Enabling multiple features represents support for
multiple OpenSSL versions, but it's then up to you to check which
version you link against (probably by depending on openssl-sys and
making a build script similar to what openssl does).
2016-10-17 21:57:54 -07:00
b7400d56e8
Fix algorithm field
2016-10-16 23:22:00 -07:00
78daed2d58
ssl error handling cleanup
2016-10-16 20:14:04 -07:00
6ea551dc82
Fix set_read_ahead signature
2016-10-15 16:53:10 -07:00
ee18988584
De-enumify SslMethod
2016-10-15 16:10:03 -07:00
c171be551a
De-enumify message digests
2016-10-15 15:23:29 -07:00
64b8e5e553
Merge pull request #471 from sfackler/no-comp
...
Handle OPENSSL_NO_COMP
2016-10-14 23:09:11 -07:00
7ac0599638
Fix test_alpn_server_select_none
...
In OpenSSL 1.1, a failure to negotiate a protocol is a fatal error, so
fork that test. This also popped up an issue where we assumed all errors
had library, function, and reason strings which is not necessarily the
case.
While we're in here, adjust the Display impl to match what OpenSSL
prints out.
Closes #465
2016-10-14 22:01:21 -07:00
f520aa2860
Handle OPENSSL_NO_COMP
...
Closes #459
2016-10-14 20:50:45 -07:00
d976b8f595
Enable hostname verification on 1.0.2
2016-10-14 18:56:15 -07:00
af51b263b1
Support hostname verification
...
Closes #206
2016-10-14 17:39:31 -07:00
0908fddc74
Ignore DTLS tests on Windows/ARM for now
...
cc #467
2016-10-14 11:15:22 -07:00
f44cff29e6
Cleanup
2016-10-13 22:34:39 -07:00
3d535f661f
Use stdlib logic for udp
2016-10-13 20:15:26 -07:00
a09f46266d
Fix windows for real
2016-10-13 20:09:43 -07:00
5b29fc9d69
Disable npn tests on < 1.0.2
...
s_client doesn't seem to support the required flag before then.
2016-10-13 20:03:02 -07:00
140ef1b988
Fix tests on windows
2016-10-13 20:01:31 -07:00
143556078b
Reenable dtls tests
2016-10-13 19:48:30 -07:00
edfc50f37d
Clean up features
2016-10-13 19:46:13 -07:00
b610e01793
Flag off dtls and mask ssl_ops
...
Also un-feature gate npn as it ships with 1.0.1
2016-10-13 19:06:53 -07:00
715b700aff
Ignore a test on OpenSSL 1.1.0
2016-10-12 22:51:47 -07:00
af3e06d3e8
Add remaining SSL_OP constants
2016-10-12 22:50:08 -07:00
43c951f743
Add support for OpenSSL 1.1.0
...
This commit is relatively major refactoring of the `openssl-sys` crate as well
as the `openssl` crate itself. The end goal here was to support OpenSSL 1.1.0,
and lots of other various tweaks happened along the way. The major new features
are:
* OpenSSL 1.1.0 is supported
* OpenSSL 0.9.8 is no longer supported (aka all OSX users by default)
* All FFI bindings are verified with the `ctest` crate (same way as the `libc`
crate)
* CI matrixes are vastly expanded to include 32/64 of all platforms, more
OpenSSL version coverage, as well as ARM coverage on Linux
* The `c_helpers` module is completely removed along with the `gcc` dependency.
* The `openssl-sys` build script was completely rewritten
* Now uses `OPENSSL_DIR` to find the installation, not include/lib env vars.
* Better error messages for mismatched versions.
* Better error messages for failing to find OpenSSL on a platform (more can be
done here)
* Probing of OpenSSL build-time configuration to inform the API of the `*-sys`
crate.
* Many Cargo features have been removed as they're now enabled by default.
As this is a breaking change to both the `openssl` and `openssl-sys` crates this
will necessitate a major version bump of both. There's still a few more API
questions remaining but let's hash that out on a PR!
Closes #452
2016-10-12 22:49:55 -07:00
cd69343d67
Fix SslContext::add_extra_chain_cert
...
SSL_CTX_add_extra_chain_cert assumes ownership of the certificate, so
the method really needs to take an X509 by value. Work around this by
manually cloning the cert.
This method has been around for over a year but I'm guessing nobody
actually used it since it produces a nice double free into segfault!
2016-08-17 19:30:57 -07:00
80ed1ef8ab
Ignore flickering test on windows
2016-08-16 22:41:36 -07:00
6b12a0cdde
PKCS #12 support
2016-08-14 11:11:26 -07:00
ad4a8cc140
More test fixes
2016-08-14 11:05:53 -07:00
3876332734
Fix tests
2016-08-14 10:29:55 -07:00
773a6f0735
Start on PKCS #12 support
2016-08-14 10:11:38 -07:00
5042d3d170
Mangle c helper functions
...
We want to make sure that multiple openssl versions can coexist in the
same dependency tree.
Closes #438
2016-08-13 12:05:29 -07:00
b21805f541
Fix tests
2016-08-10 22:10:32 -07:00
0359afb99e
Little tweaks
2016-08-10 22:02:36 -07:00
59fe901357
Method renames
2016-08-10 21:28:17 -07:00
5e6b8e68fd
More API cleanup
2016-08-10 21:07:41 -07:00
0854632ff5
Make c_helpers optional
2016-08-09 22:02:49 -07:00
2f46c793e5
Remove rust_SSL_clone
2016-08-09 21:23:54 -07:00
25752280ae
Move init to crate root
2016-08-07 22:09:19 -07:00
79602b6af4
get_error -> error
2016-08-07 21:34:58 -07:00
5af01a5dbd
Clean up asn1time
2016-08-06 22:23:03 -07:00
fe47e93f2f
Fix pkey method safety
2016-08-05 21:04:40 -07:00
b4145c6fa5
Clean up x509
2016-08-05 20:55:05 -07:00
c47be8b14b
Move SSL_CTX_set_ecdh_auto to -sys
2016-08-04 22:52:40 -07:00
ee67ea8ea0
Mvoe SSL_CTX_add_extra_chain_cert to -sys
2016-08-04 22:46:47 -07:00
378b86326c
Move SSL_CTX_set_tmp_dh to -sys
2016-08-04 22:43:24 -07:00
7fb7f4671d
Move SSL_CTX_set_read_ahead to -sys
2016-08-04 22:40:01 -07:00
77dbab2cad
Move SSL_CTX_set_tlsext_servername_callback to -sys
2016-08-04 22:37:39 -07:00
c2a7c5b7f0
Move SSL_set_tlsext_host_name to -sys
2016-08-04 22:28:33 -07:00
b29ea62491
Move BIO macros into -sys
2016-08-04 22:22:55 -07:00
dd16f64f89
Stop once-ing init wrapper
...
The underlying function already once-s itself
2016-08-04 22:15:50 -07:00
17474520bc
Support basic SSL options without C shims
2016-08-04 22:14:18 -07:00
abacc8bb18
Define SSL_CTX_set_mode in openssl-sys
2016-08-02 22:14:44 -07:00
Steven Fackler