Matt Caswell
02f0c26cea
Re-align some comments after running the reformat script.
...
This should be a one off operation (subsequent invokation of the
script should not move them)
This commit is for the 0.9.8 changes
Reviewed-by: Tim Hudson <tjh@openssl.org>
2015-01-22 09:53:07 +00:00
Matt Caswell
40720ce3ca
Run util/openssl-format-source -v -c .
...
Reviewed-by: Tim Hudson <tjh@openssl.org>
2015-01-22 09:52:55 +00:00
Matt Caswell
c7c7a432df
indent has problems with comments that are on the right hand side of a line.
...
Sometimes it fails to format them very well, and sometimes it corrupts them!
This commit moves some particularly problematic ones.
Conflicts:
crypto/bn/bn.h
crypto/ec/ec_lcl.h
crypto/rsa/rsa.h
demos/engines/ibmca/hw_ibmca.c
ssl/ssl.h
ssl/ssl3.h
Conflicts:
crypto/ec/ec_lcl.h
ssl/tls1.h
Conflicts:
crypto/ec/ecp_nistp224.c
crypto/evp/evp.h
ssl/d1_both.c
ssl/ssl.h
ssl/ssl_lib.c
Conflicts:
crypto/bio/bss_file.c
crypto/ec/ec_lcl.h
crypto/evp/evp.h
crypto/store/str_mem.c
crypto/whrlpool/wp_block.c
crypto/x509/x509_vfy.h
ssl/ssl.h
ssl/ssl3.h
ssl/ssltest.c
ssl/t1_lib.c
ssl/tls1.h
Reviewed-by: Tim Hudson <tjh@openssl.org>
2015-01-22 09:50:57 +00:00
Matt Caswell
00ea17f9d7
Fix source where indent will not be able to cope
...
Conflicts:
apps/ciphers.c
ssl/s3_pkt.c
Conflicts:
crypto/ec/ec_curve.c
Conflicts:
crypto/ec/ec_curve.c
ssl/s3_clnt.c
ssl/s3_srvr.c
ssl/ssl_sess.c
Conflicts:
apps/ciphers.c
crypto/bn/bn.h
crypto/ec/ec_curve.c
ssl/t1_enc.c
ssl/t1_lib.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
2015-01-22 09:49:13 +00:00
Matt Caswell
3e8042c38f
Additional comment changes for reformat of 0.9.8
...
Reviewed-by: Tim Hudson <tjh@openssl.org>
2015-01-22 09:49:06 +00:00
Bodo Moeller
3f4d81e88b
Add TLS_FALLBACK_SCSV documentation, and move s_client -fallback_scsv
...
handling out of #ifndef OPENSSL_NO_DTLS1 section.
Reviewed-by: Rich Salz <rsalz@openssl.org>
2014-10-15 11:15:58 +02:00
Bodo Moeller
c6a876473c
Support TLS_FALLBACK_SCSV.
...
Reviewed-by: Stephen Henson <steve@openssl.org>
2014-10-15 04:18:29 +02:00
Dr. Stephen Henson
a9101cdcaa
Always use SSLv23_{client,server}_method in s_client.c and s_server.c,
...
the old code came from SSLeay days before TLS was even supported.
2012-03-18 18:18:30 +00:00
Dr. Stephen Henson
ccc3df8c33
New option to enable/disable connection to unpatched servers
2009-12-16 20:34:20 +00:00
Dr. Stephen Henson
59f44e810b
Add ctrl and macro so we can determine if peer support secure renegotiation.
...
Fix SSL_CIPHER initialiser for mcsv
2009-12-08 13:47:28 +00:00
Ben Laurie
c2b78c31d6
First cut of renegotiation extension.
2009-11-08 14:51:54 +00:00
Dr. Stephen Henson
fbc4a24633
PR: 1997
...
Submitted by: Robin Seggelmann <seggelmann@fh-muenster.de>
Approved by: steve@openssl.org
DTLS timeout handling fix.
2009-08-13 15:14:32 +00:00
Dr. Stephen Henson
3e82dfdf2d
Formatting fix.
2009-05-17 16:48:19 +00:00
Dr. Stephen Henson
b7d0d35a13
Modified PR#1929 update from 1.0.0-stable.
2009-05-17 16:42:14 +00:00
Dr. Stephen Henson
2cad035c01
Make no-engine work again...
2008-12-20 17:04:09 +00:00
Dr. Stephen Henson
5a02ac6e5b
Revert OPENSSL_EXPERIMENTAL patch.
...
Change it so JPAKE uses the standard OPENSSL_NO_JPAKE instead.
2008-11-24 16:14:15 +00:00
Dr. Stephen Henson
81dde5e8fe
Add support for experimental code, not compiled in by default and
...
with OPENSSL_EXPERIMENTAL_FOO around it. Make JPAKE experimental.
2008-11-12 16:54:35 +00:00
Ben Laurie
2124e869a8
Add JPAKE.
2008-10-26 18:42:05 +00:00
Dr. Stephen Henson
7471431322
Avoid warning.
2008-10-26 11:54:26 +00:00
Lutz Jänicke
155c70b882
Allow detection of input EOF in quiet mode by adding -no_ign_eof option
...
to s_client application.
PR: #1761
Submitted by: David Woodhouse <dwmw2@infradead.org>
2008-10-22 06:46:13 +00:00
Ben Laurie
5dffc13f55
Add XMPP STARTTLS support.
2008-10-14 19:09:47 +00:00
Dr. Stephen Henson
5799b72178
Oops... missed this part of backport.
2008-06-04 20:11:17 +00:00
Dr. Stephen Henson
1cfe6842d5
Backport s_client changes.
2008-06-04 19:52:36 +00:00
Ben Laurie
e66deb6817
Fix warnings.
2007-11-15 13:32:16 +00:00
Dr. Stephen Henson
a523276786
Backport certificate status request TLS extension support to 0.9.8.
2007-10-12 00:00:36 +00:00
Dr. Stephen Henson
80355002a1
Update from HEAD.
2007-08-23 12:20:56 +00:00
Dr. Stephen Henson
0e36825228
Update docs.
2007-08-23 12:16:03 +00:00
Dr. Stephen Henson
865a90eb4f
Backport of TLS extension code to OpenSSL 0.9.8.
...
Include server name and RFC4507bis support.
This is not compiled in by default and must be explicitly enabled with
the Configure option enable-tlsext
2007-08-12 18:59:03 +00:00
Dr. Stephen Henson
761f3b403b
Fix more unused value warnings.
2007-07-04 13:09:27 +00:00
Lutz Jänicke
81fae49db9
Fix problem with multi line responses in -starttls by using a buffering
...
BIO and BIO_gets().
2007-02-22 17:39:50 +00:00
Lutz Jänicke
cdb13ae8d0
Extend SMTP and IMAP protocol handling to perform the required
...
EHLO or CAPABILITY handshake before sending STARTTLS
Submitted by: Goetz Babin-Ebell <goetz@shomitefo.de>
2007-02-21 18:20:33 +00:00
Dr. Stephen Henson
c31cc72d79
Avoid warning.
2007-02-18 18:18:31 +00:00
Richard Levitte
28f5873179
Add STARTTLS support for IMAP and FTP.
...
Submitted by Kees Cook <kees@outflux.net>
2007-02-16 18:12:20 +00:00
Nils Larsch
d4a6240005
replace macros with functions
...
Submitted by: Tracy Camp <tracyx.e.camp@intel.com>
2006-11-29 20:47:15 +00:00
Ben Laurie
9e31e63147
Improve documentation.
2005-11-25 13:46:41 +00:00
Dr. Stephen Henson
54f51116b2
Update from HEAD.
2005-09-30 23:38:20 +00:00
Richard Levitte
77b97ee0d7
DJGPP changes. Contributed by Doug Kaufman <dkaufman@rahul.net>
2005-05-30 22:37:41 +00:00
Dr. Stephen Henson
6c61726b2a
Lots of Win32 fixes for DTLS.
...
1. "unsigned long long" isn't portable changed: to BN_ULLONG.
2. The LL prefix isn't allowed in VC++ but it isn't needed where it is used.
2. Avoid lots of compiler warnings about signed/unsigned mismatches.
3. Include new library directory pqueue in mk1mf build system.
4. Update symbols.
2005-04-27 16:27:14 +00:00
Dr. Stephen Henson
4e321ffaff
Fixes for signed/unsigned warnings and shadows.
2005-04-26 17:43:53 +00:00
Ben Laurie
36d16f8ee0
Add DTLS support.
2005-04-26 16:02:40 +00:00
Nils Larsch
7d727231b7
some const fixes
2005-04-05 19:11:19 +00:00
Andy Polyakov
02a00bb054
DJGPP update.
...
PR: 989
Submitted by: Doug Kaufman
2005-01-04 10:28:38 +00:00
Dr. Stephen Henson
abbc186bd2
Fix s_client so it works without a certificate again.
2004-12-13 18:02:23 +00:00
Dr. Stephen Henson
826a42a088
PR: 910
...
Add command line options -certform, -keyform and -pass to s_client and
s_server. This supports the use of alternative passphrase sources, key formats
and keys handled by an ENGINE.
Update docs.
2004-11-16 17:30:59 +00:00
Richard Levitte
2549564009
On systems that use case-insensitive symbol names (i.e. they're all
...
converted to upper case or something like that), the application-
level bio_dump_cb() has a name clash with the new library function
BIO_dump_cb(). The easiest fix is to rename the function at the
application level.
2004-08-12 08:58:55 +00:00
Richard Levitte
47c1735acd
NetWare fixes provided by Verdon Walker for OpenSSL 0.9.8-dev.
...
The changes have been mailed to <crypt@bis.doc.gov> as well.
PR: 903
2004-06-28 11:55:28 +00:00
Richard Levitte
4d8743f490
Netware-specific changes,
...
PR: 780
Submitted by: Verdon Walker <VWalker@novell.com>
Reviewed by: Richard Levitte
2003-11-28 13:10:58 +00:00
Geoff Thorpe
d8ec0dcf45
Avoid some shadowed variable names.
...
Submitted by: Nils Larsch
2003-11-04 00:51:32 +00:00
Richard Levitte
f44e184ec6
s_client should inform the user of any compression/expansion methods used.
2003-10-06 12:19:38 +00:00
Richard Levitte
3d7c4a5a6d
Selected changes for MSDOS, contributed by Gisle Vanem <giva@bgnett.no>.
...
PR: 669
2003-09-27 21:56:08 +00:00