1998-12-21 10:56:39 +00:00
|
|
|
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
1998-12-21 10:52:47 +00:00
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* This package is an SSL implementation written
|
|
|
|
* by Eric Young (eay@cryptsoft.com).
|
|
|
|
* The implementation was written so as to conform with Netscapes SSL.
|
2015-01-22 03:40:55 +00:00
|
|
|
*
|
1998-12-21 10:52:47 +00:00
|
|
|
* This library is free for commercial and non-commercial use as long as
|
|
|
|
* the following conditions are aheared to. The following conditions
|
|
|
|
* apply to all code found in this distribution, be it the RC4, RSA,
|
|
|
|
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
|
|
|
* included with this distribution is covered by the same copyright terms
|
|
|
|
* except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
2015-01-22 03:40:55 +00:00
|
|
|
*
|
1998-12-21 10:52:47 +00:00
|
|
|
* Copyright remains Eric Young's, and as such any Copyright notices in
|
|
|
|
* the code are not to be removed.
|
|
|
|
* If this package is used in a product, Eric Young should be given attribution
|
|
|
|
* as the author of the parts of the library used.
|
|
|
|
* This can be in the form of a textual message at program startup or
|
|
|
|
* in documentation (online or textual) provided with the package.
|
2015-01-22 03:40:55 +00:00
|
|
|
*
|
1998-12-21 10:52:47 +00:00
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
* "This product includes cryptographic software written by
|
|
|
|
* Eric Young (eay@cryptsoft.com)"
|
|
|
|
* The word 'cryptographic' can be left out if the rouines from the library
|
|
|
|
* being used are not cryptographic related :-).
|
2015-01-22 03:40:55 +00:00
|
|
|
* 4. If you include any Windows specific code (or a derivative thereof) from
|
1998-12-21 10:52:47 +00:00
|
|
|
* the apps directory (application code) you must include an acknowledgement:
|
|
|
|
* "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
2015-01-22 03:40:55 +00:00
|
|
|
*
|
1998-12-21 10:52:47 +00:00
|
|
|
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
2015-01-22 03:40:55 +00:00
|
|
|
*
|
1998-12-21 10:52:47 +00:00
|
|
|
* The licence and distribution terms for any publically available version or
|
|
|
|
* derivative of this code cannot be changed. i.e. this code cannot simply be
|
|
|
|
* copied and put under another distribution licence
|
|
|
|
* [including the GNU Public Licence.]
|
|
|
|
*/
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
/* ====================================================================
|
|
|
|
* Copyright (c) 199-2015 The OpenSSL Project. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
*
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
*
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in
|
|
|
|
* the documentation and/or other materials provided with the
|
|
|
|
* distribution.
|
|
|
|
*
|
|
|
|
* 3. All advertising materials mentioning features or use of this
|
|
|
|
* software must display the following acknowledgment:
|
|
|
|
* "This product includes software developed by the OpenSSL Project
|
|
|
|
* for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
|
|
|
|
*
|
|
|
|
* 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
|
|
|
|
* endorse or promote products derived from this software without
|
|
|
|
* prior written permission. For written permission, please contact
|
|
|
|
* licensing@OpenSSL.org.
|
|
|
|
*
|
|
|
|
* 5. Products derived from this software may not be called "OpenSSL"
|
|
|
|
* nor may "OpenSSL" appear in their names without prior written
|
|
|
|
* permission of the OpenSSL Project.
|
|
|
|
*
|
|
|
|
* 6. Redistributions of any form whatsoever must retain the following
|
|
|
|
* acknowledgment:
|
|
|
|
* "This product includes software developed by the OpenSSL Project
|
|
|
|
* for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
|
|
|
|
* EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
|
|
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
|
|
|
|
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
|
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
|
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
|
|
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
|
|
|
* OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
* ====================================================================
|
|
|
|
*/
|
1998-12-21 10:52:47 +00:00
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
/* socket-related functions used by s_client and s_server */
|
1999-07-28 23:25:59 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <signal.h>
|
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
/*
|
|
|
|
* With IPv6, it looks like Digital has mixed up the proper order of
|
|
|
|
* recursive header file inclusion, resulting in the compiler complaining
|
|
|
|
* that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which is
|
|
|
|
* needed to have fileno() declared correctly... So let's define u_int
|
|
|
|
*/
|
2001-02-20 08:13:47 +00:00
|
|
|
#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
|
2015-01-22 03:40:55 +00:00
|
|
|
# define __U_INT
|
1999-05-13 11:37:32 +00:00
|
|
|
typedef unsigned int u_int;
|
|
|
|
#endif
|
|
|
|
|
2001-02-20 17:37:02 +00:00
|
|
|
#define USE_SOCKETS
|
|
|
|
#include "apps.h"
|
|
|
|
#undef USE_SOCKETS
|
|
|
|
#include "s_apps.h"
|
|
|
|
#include <openssl/ssl.h>
|
|
|
|
|
2002-11-28 08:04:36 +00:00
|
|
|
#ifdef FLAT_INC
|
2015-01-22 03:40:55 +00:00
|
|
|
# include "e_os.h"
|
2002-11-28 08:04:36 +00:00
|
|
|
#else
|
2015-01-22 03:40:55 +00:00
|
|
|
# include "../e_os.h"
|
2002-11-28 08:04:36 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef OPENSSL_NO_SOCK
|
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
# if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_BSDSOCK)
|
|
|
|
# include "netdb.h"
|
|
|
|
# endif
|
2005-06-13 03:23:50 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
# if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
|
2002-11-14 11:22:01 +00:00
|
|
|
static void ssl_sock_cleanup(void);
|
2015-01-22 03:40:55 +00:00
|
|
|
# endif
|
2002-11-14 11:22:01 +00:00
|
|
|
static int ssl_sock_init(void);
|
2011-01-09 17:50:18 +00:00
|
|
|
static int init_client_ip(int *sock, const unsigned char ip[4], int port,
|
2015-01-22 03:40:55 +00:00
|
|
|
int type);
|
2005-04-26 16:02:40 +00:00
|
|
|
static int init_server(int *sock, int port, int type);
|
2015-01-22 03:40:55 +00:00
|
|
|
static int init_server_long(int *sock, int port, char *ip, int type);
|
2000-03-12 23:27:14 +00:00
|
|
|
static int do_accept(int acc_sock, int *sock, char **host);
|
2014-04-25 18:27:02 +00:00
|
|
|
static int host_ip(const char *str, unsigned char ip[4]);
|
2015-01-22 03:40:55 +00:00
|
|
|
# ifndef NO_SYS_UN_H
|
s_client/s_server: support unix domain sockets
The "-unix <path>" argument allows s_server and s_client to use a unix
domain socket in the filesystem instead of IPv4 ("-connect", "-port",
"-accept", etc). If s_server exits gracefully, such as when "-naccept"
is used and the requested number of SSL/TLS connections have occurred,
then the domain socket file is removed. On ctrl-C, it is likely that
the stale socket file will be left over, such that s_server would
normally fail to restart with the same arguments. For this reason,
s_server also supports an "-unlink" option, which will clean up any
stale socket file before starting.
If you have any reason to want encrypted IPC within an O/S instance,
this concept might come in handy. Otherwise it just demonstrates that
there is nothing about SSL/TLS that limits it to TCP/IP in any way.
(There might also be benchmarking and profiling use in this path, as
unix domain sockets are much lower overhead than connecting over local
IP addresses).
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
2014-04-26 05:22:54 +00:00
|
|
|
static int init_server_unix(int *sock, const char *path);
|
|
|
|
static int do_accept_unix(int acc_sock, int *sock);
|
2015-01-22 03:40:55 +00:00
|
|
|
# endif
|
2000-03-12 23:27:14 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
# if defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)
|
|
|
|
static int wsa_init_done = 0;
|
|
|
|
# endif
|
2003-11-28 13:10:58 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
# ifdef OPENSSL_SYS_WINDOWS
|
1998-12-21 10:52:47 +00:00
|
|
|
static struct WSAData wsa_state;
|
2015-01-22 03:40:55 +00:00
|
|
|
static int wsa_init_done = 0;
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
# endif /* OPENSSL_SYS_WINDOWS */
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
# ifdef OPENSSL_SYS_WINDOWS
|
2002-11-14 11:22:01 +00:00
|
|
|
static void ssl_sock_cleanup(void)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
if (wsa_init_done) {
|
|
|
|
wsa_init_done = 0;
|
|
|
|
# ifndef OPENSSL_SYS_WINCE
|
|
|
|
WSACancelBlockingCall();
|
|
|
|
# endif
|
|
|
|
WSACleanup();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
# elif defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)
|
2003-11-28 13:10:58 +00:00
|
|
|
static void sock_cleanup(void)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
if (wsa_init_done) {
|
|
|
|
wsa_init_done = 0;
|
|
|
|
WSACleanup();
|
|
|
|
}
|
|
|
|
}
|
2003-11-28 13:10:58 +00:00
|
|
|
# endif
|
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
static int ssl_sock_init(void)
|
|
|
|
{
|
|
|
|
# ifdef WATT32
|
|
|
|
extern int _watt_do_exit;
|
|
|
|
_watt_do_exit = 0;
|
|
|
|
if (sock_init())
|
|
|
|
return (0);
|
|
|
|
# elif defined(OPENSSL_SYS_WINDOWS)
|
|
|
|
if (!wsa_init_done) {
|
|
|
|
int err;
|
|
|
|
|
|
|
|
# ifdef SIGINT
|
|
|
|
signal(SIGINT, (void (*)(int))ssl_sock_cleanup);
|
|
|
|
# endif
|
|
|
|
wsa_init_done = 1;
|
|
|
|
memset(&wsa_state, 0, sizeof(wsa_state));
|
|
|
|
if (WSAStartup(0x0101, &wsa_state) != 0) {
|
|
|
|
err = WSAGetLastError();
|
|
|
|
BIO_printf(bio_err, "unable to start WINSOCK, error code=%d\n",
|
|
|
|
err);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
# elif defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)
|
|
|
|
WORD wVerReq;
|
|
|
|
WSADATA wsaData;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
if (!wsa_init_done) {
|
|
|
|
|
|
|
|
# ifdef SIGINT
|
|
|
|
signal(SIGINT, (void (*)(int))sock_cleanup);
|
|
|
|
# endif
|
|
|
|
|
|
|
|
wsa_init_done = 1;
|
|
|
|
wVerReq = MAKEWORD(2, 0);
|
|
|
|
err = WSAStartup(wVerReq, &wsaData);
|
|
|
|
if (err != 0) {
|
|
|
|
BIO_printf(bio_err, "unable to start WINSOCK2, error code=%d\n",
|
|
|
|
err);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
}
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
# endif
|
2015-01-22 03:40:55 +00:00
|
|
|
return (1);
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2014-04-25 18:27:02 +00:00
|
|
|
int init_client(int *sock, const char *host, int port, int type)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
unsigned char ip[4];
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
ip[0] = ip[1] = ip[2] = ip[3] = 0;
|
|
|
|
if (!host_ip(host, &(ip[0])))
|
|
|
|
return 0;
|
|
|
|
return init_client_ip(sock, ip, port, type);
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2011-01-09 17:50:18 +00:00
|
|
|
static int init_client_ip(int *sock, const unsigned char ip[4], int port,
|
2015-01-22 03:40:55 +00:00
|
|
|
int type)
|
|
|
|
{
|
|
|
|
unsigned long addr;
|
|
|
|
struct sockaddr_in them;
|
|
|
|
int s, i;
|
|
|
|
|
|
|
|
if (!ssl_sock_init())
|
|
|
|
return (0);
|
|
|
|
|
2015-05-04 22:00:15 +00:00
|
|
|
memset(&them, 0, sizeof(them));
|
2015-01-22 03:40:55 +00:00
|
|
|
them.sin_family = AF_INET;
|
|
|
|
them.sin_port = htons((unsigned short)port);
|
|
|
|
addr = (unsigned long)
|
|
|
|
((unsigned long)ip[0] << 24L) |
|
|
|
|
((unsigned long)ip[1] << 16L) |
|
|
|
|
((unsigned long)ip[2] << 8L) | ((unsigned long)ip[3]);
|
|
|
|
them.sin_addr.s_addr = htonl(addr);
|
|
|
|
|
|
|
|
if (type == SOCK_STREAM)
|
|
|
|
s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
|
|
|
|
else /* ( type == SOCK_DGRAM) */
|
|
|
|
s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
|
|
|
|
|
2015-09-30 08:15:03 +00:00
|
|
|
if (s == (int)INVALID_SOCKET) {
|
2015-01-22 03:40:55 +00:00
|
|
|
perror("socket");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
# if defined(SO_KEEPALIVE)
|
|
|
|
if (type == SOCK_STREAM) {
|
|
|
|
i = 0;
|
|
|
|
i = setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, (char *)&i, sizeof(i));
|
|
|
|
if (i < 0) {
|
|
|
|
closesocket(s);
|
|
|
|
perror("keepalive");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
# endif
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
if (connect(s, (struct sockaddr *)&them, sizeof(them)) == -1) {
|
|
|
|
closesocket(s);
|
|
|
|
perror("connect");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
*sock = s;
|
|
|
|
return (1);
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
# ifndef NO_SYS_UN_H
|
s_client/s_server: support unix domain sockets
The "-unix <path>" argument allows s_server and s_client to use a unix
domain socket in the filesystem instead of IPv4 ("-connect", "-port",
"-accept", etc). If s_server exits gracefully, such as when "-naccept"
is used and the requested number of SSL/TLS connections have occurred,
then the domain socket file is removed. On ctrl-C, it is likely that
the stale socket file will be left over, such that s_server would
normally fail to restart with the same arguments. For this reason,
s_server also supports an "-unlink" option, which will clean up any
stale socket file before starting.
If you have any reason to want encrypted IPC within an O/S instance,
this concept might come in handy. Otherwise it just demonstrates that
there is nothing about SSL/TLS that limits it to TCP/IP in any way.
(There might also be benchmarking and profiling use in this path, as
unix domain sockets are much lower overhead than connecting over local
IP addresses).
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
2014-04-26 05:22:54 +00:00
|
|
|
int init_client_unix(int *sock, const char *server)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
struct sockaddr_un them;
|
|
|
|
int s;
|
|
|
|
|
|
|
|
if (strlen(server) > (UNIX_PATH_MAX + 1))
|
|
|
|
return (0);
|
|
|
|
if (!ssl_sock_init())
|
|
|
|
return (0);
|
|
|
|
|
|
|
|
s = socket(AF_UNIX, SOCK_STREAM, 0);
|
2015-09-30 08:15:03 +00:00
|
|
|
if (s == (int)INVALID_SOCKET) {
|
2015-01-22 03:40:55 +00:00
|
|
|
perror("socket");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
2015-05-04 22:00:15 +00:00
|
|
|
memset(&them, 0, sizeof(them));
|
2015-01-22 03:40:55 +00:00
|
|
|
them.sun_family = AF_UNIX;
|
|
|
|
strcpy(them.sun_path, server);
|
|
|
|
|
|
|
|
if (connect(s, (struct sockaddr *)&them, sizeof(them)) == -1) {
|
|
|
|
closesocket(s);
|
|
|
|
perror("connect");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
*sock = s;
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
# endif
|
s_client/s_server: support unix domain sockets
The "-unix <path>" argument allows s_server and s_client to use a unix
domain socket in the filesystem instead of IPv4 ("-connect", "-port",
"-accept", etc). If s_server exits gracefully, such as when "-naccept"
is used and the requested number of SSL/TLS connections have occurred,
then the domain socket file is removed. On ctrl-C, it is likely that
the stale socket file will be left over, such that s_server would
normally fail to restart with the same arguments. For this reason,
s_server also supports an "-unlink" option, which will clean up any
stale socket file before starting.
If you have any reason to want encrypted IPC within an O/S instance,
this concept might come in handy. Otherwise it just demonstrates that
there is nothing about SSL/TLS that limits it to TCP/IP in any way.
(There might also be benchmarking and profiling use in this path, as
unix domain sockets are much lower overhead than connecting over local
IP addresses).
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
2014-04-26 05:22:54 +00:00
|
|
|
|
|
|
|
int do_server(int port, int type, int *ret,
|
2015-01-22 03:40:55 +00:00
|
|
|
int (*cb) (char *hostname, int s, int stype,
|
|
|
|
unsigned char *context), unsigned char *context,
|
|
|
|
int naccept)
|
|
|
|
{
|
|
|
|
int sock;
|
|
|
|
char *name = NULL;
|
|
|
|
int accept_socket = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!init_server(&accept_socket, port, type))
|
|
|
|
return (0);
|
|
|
|
|
|
|
|
if (ret != NULL) {
|
|
|
|
*ret = accept_socket;
|
|
|
|
/* return(1); */
|
|
|
|
}
|
|
|
|
for (;;) {
|
|
|
|
if (type == SOCK_STREAM) {
|
|
|
|
# ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL
|
|
|
|
if (do_accept(accept_socket, &sock, NULL) == 0)
|
|
|
|
# else
|
|
|
|
if (do_accept(accept_socket, &sock, &name) == 0)
|
|
|
|
# endif
|
|
|
|
{
|
|
|
|
SHUTDOWN(accept_socket);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
sock = accept_socket;
|
|
|
|
i = (*cb) (name, sock, type, context);
|
2015-05-01 14:02:07 +00:00
|
|
|
OPENSSL_free(name);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (type == SOCK_STREAM)
|
|
|
|
SHUTDOWN2(sock);
|
|
|
|
if (naccept != -1)
|
|
|
|
naccept--;
|
|
|
|
if (i < 0 || naccept == 0) {
|
|
|
|
SHUTDOWN2(accept_socket);
|
|
|
|
return (i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
# ifndef NO_SYS_UN_H
|
s_client/s_server: support unix domain sockets
The "-unix <path>" argument allows s_server and s_client to use a unix
domain socket in the filesystem instead of IPv4 ("-connect", "-port",
"-accept", etc). If s_server exits gracefully, such as when "-naccept"
is used and the requested number of SSL/TLS connections have occurred,
then the domain socket file is removed. On ctrl-C, it is likely that
the stale socket file will be left over, such that s_server would
normally fail to restart with the same arguments. For this reason,
s_server also supports an "-unlink" option, which will clean up any
stale socket file before starting.
If you have any reason to want encrypted IPC within an O/S instance,
this concept might come in handy. Otherwise it just demonstrates that
there is nothing about SSL/TLS that limits it to TCP/IP in any way.
(There might also be benchmarking and profiling use in this path, as
unix domain sockets are much lower overhead than connecting over local
IP addresses).
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
2014-04-26 05:22:54 +00:00
|
|
|
int do_server_unix(const char *path, int *ret,
|
2015-01-22 03:40:55 +00:00
|
|
|
int (*cb) (char *hostname, int s, int stype,
|
|
|
|
unsigned char *context), unsigned char *context,
|
|
|
|
int naccept)
|
|
|
|
{
|
|
|
|
int sock;
|
|
|
|
int accept_socket = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!init_server_unix(&accept_socket, path))
|
|
|
|
return (0);
|
|
|
|
|
|
|
|
if (ret != NULL)
|
|
|
|
*ret = accept_socket;
|
|
|
|
for (;;) {
|
|
|
|
if (do_accept_unix(accept_socket, &sock) == 0) {
|
|
|
|
SHUTDOWN(accept_socket);
|
|
|
|
i = 0;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
i = (*cb) (NULL, sock, 0, context);
|
|
|
|
SHUTDOWN2(sock);
|
|
|
|
if (naccept != -1)
|
|
|
|
naccept--;
|
|
|
|
if (i < 0 || naccept == 0) {
|
|
|
|
SHUTDOWN2(accept_socket);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
out:
|
|
|
|
unlink(path);
|
|
|
|
return (i);
|
|
|
|
}
|
|
|
|
# endif
|
s_client/s_server: support unix domain sockets
The "-unix <path>" argument allows s_server and s_client to use a unix
domain socket in the filesystem instead of IPv4 ("-connect", "-port",
"-accept", etc). If s_server exits gracefully, such as when "-naccept"
is used and the requested number of SSL/TLS connections have occurred,
then the domain socket file is removed. On ctrl-C, it is likely that
the stale socket file will be left over, such that s_server would
normally fail to restart with the same arguments. For this reason,
s_server also supports an "-unlink" option, which will clean up any
stale socket file before starting.
If you have any reason to want encrypted IPC within an O/S instance,
this concept might come in handy. Otherwise it just demonstrates that
there is nothing about SSL/TLS that limits it to TCP/IP in any way.
(There might also be benchmarking and profiling use in this path, as
unix domain sockets are much lower overhead than connecting over local
IP addresses).
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
2014-04-26 05:22:54 +00:00
|
|
|
|
2005-04-26 16:02:40 +00:00
|
|
|
static int init_server_long(int *sock, int port, char *ip, int type)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
struct sockaddr_in server;
|
|
|
|
int s = -1;
|
|
|
|
|
|
|
|
if (!ssl_sock_init())
|
|
|
|
return (0);
|
|
|
|
|
2015-05-04 22:00:15 +00:00
|
|
|
memset(&server, 0, sizeof(server));
|
2015-01-22 03:40:55 +00:00
|
|
|
server.sin_family = AF_INET;
|
|
|
|
server.sin_port = htons((unsigned short)port);
|
|
|
|
if (ip == NULL)
|
|
|
|
server.sin_addr.s_addr = INADDR_ANY;
|
|
|
|
else
|
1998-12-22 15:59:57 +00:00
|
|
|
/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
|
2015-01-22 03:40:55 +00:00
|
|
|
# ifndef BIT_FIELD_LIMITS
|
|
|
|
memcpy(&server.sin_addr.s_addr, ip, 4);
|
|
|
|
# else
|
|
|
|
memcpy(&server.sin_addr, ip, 4);
|
|
|
|
# endif
|
s_client/s_server: support unix domain sockets
The "-unix <path>" argument allows s_server and s_client to use a unix
domain socket in the filesystem instead of IPv4 ("-connect", "-port",
"-accept", etc). If s_server exits gracefully, such as when "-naccept"
is used and the requested number of SSL/TLS connections have occurred,
then the domain socket file is removed. On ctrl-C, it is likely that
the stale socket file will be left over, such that s_server would
normally fail to restart with the same arguments. For this reason,
s_server also supports an "-unlink" option, which will clean up any
stale socket file before starting.
If you have any reason to want encrypted IPC within an O/S instance,
this concept might come in handy. Otherwise it just demonstrates that
there is nothing about SSL/TLS that limits it to TCP/IP in any way.
(There might also be benchmarking and profiling use in this path, as
unix domain sockets are much lower overhead than connecting over local
IP addresses).
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
2014-04-26 05:22:54 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
if (type == SOCK_STREAM)
|
|
|
|
s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
|
|
|
|
else /* type == SOCK_DGRAM */
|
|
|
|
s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
|
s_client/s_server: support unix domain sockets
The "-unix <path>" argument allows s_server and s_client to use a unix
domain socket in the filesystem instead of IPv4 ("-connect", "-port",
"-accept", etc). If s_server exits gracefully, such as when "-naccept"
is used and the requested number of SSL/TLS connections have occurred,
then the domain socket file is removed. On ctrl-C, it is likely that
the stale socket file will be left over, such that s_server would
normally fail to restart with the same arguments. For this reason,
s_server also supports an "-unlink" option, which will clean up any
stale socket file before starting.
If you have any reason to want encrypted IPC within an O/S instance,
this concept might come in handy. Otherwise it just demonstrates that
there is nothing about SSL/TLS that limits it to TCP/IP in any way.
(There might also be benchmarking and profiling use in this path, as
unix domain sockets are much lower overhead than connecting over local
IP addresses).
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
2014-04-26 05:22:54 +00:00
|
|
|
|
2015-09-30 08:15:03 +00:00
|
|
|
if (s == (int)INVALID_SOCKET)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
# if defined SOL_SOCKET && defined SO_REUSEADDR
|
|
|
|
{
|
|
|
|
int j = 1;
|
|
|
|
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&j, sizeof j);
|
|
|
|
}
|
|
|
|
# endif
|
|
|
|
if (bind(s, (struct sockaddr *)&server, sizeof(server)) == -1) {
|
|
|
|
# ifndef OPENSSL_SYS_WINDOWS
|
|
|
|
perror("bind");
|
|
|
|
# endif
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
/* Make it 128 for linux */
|
|
|
|
if (type == SOCK_STREAM && listen(s, 128) == -1)
|
|
|
|
goto err;
|
|
|
|
*sock = s;
|
|
|
|
ret = 1;
|
|
|
|
err:
|
|
|
|
if ((ret == 0) && (s != -1)) {
|
|
|
|
SHUTDOWN(s);
|
|
|
|
}
|
|
|
|
return (ret);
|
|
|
|
}
|
s_client/s_server: support unix domain sockets
The "-unix <path>" argument allows s_server and s_client to use a unix
domain socket in the filesystem instead of IPv4 ("-connect", "-port",
"-accept", etc). If s_server exits gracefully, such as when "-naccept"
is used and the requested number of SSL/TLS connections have occurred,
then the domain socket file is removed. On ctrl-C, it is likely that
the stale socket file will be left over, such that s_server would
normally fail to restart with the same arguments. For this reason,
s_server also supports an "-unlink" option, which will clean up any
stale socket file before starting.
If you have any reason to want encrypted IPC within an O/S instance,
this concept might come in handy. Otherwise it just demonstrates that
there is nothing about SSL/TLS that limits it to TCP/IP in any way.
(There might also be benchmarking and profiling use in this path, as
unix domain sockets are much lower overhead than connecting over local
IP addresses).
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
2014-04-26 05:22:54 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
static int init_server(int *sock, int port, int type)
|
|
|
|
{
|
|
|
|
return (init_server_long(sock, port, NULL, type));
|
|
|
|
}
|
s_client/s_server: support unix domain sockets
The "-unix <path>" argument allows s_server and s_client to use a unix
domain socket in the filesystem instead of IPv4 ("-connect", "-port",
"-accept", etc). If s_server exits gracefully, such as when "-naccept"
is used and the requested number of SSL/TLS connections have occurred,
then the domain socket file is removed. On ctrl-C, it is likely that
the stale socket file will be left over, such that s_server would
normally fail to restart with the same arguments. For this reason,
s_server also supports an "-unlink" option, which will clean up any
stale socket file before starting.
If you have any reason to want encrypted IPC within an O/S instance,
this concept might come in handy. Otherwise it just demonstrates that
there is nothing about SSL/TLS that limits it to TCP/IP in any way.
(There might also be benchmarking and profiling use in this path, as
unix domain sockets are much lower overhead than connecting over local
IP addresses).
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
2014-04-26 05:22:54 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
# ifndef NO_SYS_UN_H
|
|
|
|
static int init_server_unix(int *sock, const char *path)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
struct sockaddr_un server;
|
|
|
|
int s = -1;
|
|
|
|
|
|
|
|
if (strlen(path) > (UNIX_PATH_MAX + 1))
|
|
|
|
return (0);
|
|
|
|
if (!ssl_sock_init())
|
|
|
|
return (0);
|
|
|
|
|
|
|
|
s = socket(AF_UNIX, SOCK_STREAM, 0);
|
2015-09-30 08:15:03 +00:00
|
|
|
if (s == (int)INVALID_SOCKET)
|
2015-01-22 03:40:55 +00:00
|
|
|
goto err;
|
|
|
|
|
2015-05-04 22:00:15 +00:00
|
|
|
memset(&server, 0, sizeof(server));
|
2015-01-22 03:40:55 +00:00
|
|
|
server.sun_family = AF_UNIX;
|
|
|
|
strcpy(server.sun_path, path);
|
|
|
|
|
|
|
|
if (bind(s, (struct sockaddr *)&server, sizeof(server)) == -1) {
|
|
|
|
# ifndef OPENSSL_SYS_WINDOWS
|
|
|
|
perror("bind");
|
|
|
|
# endif
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
/* Make it 128 for linux */
|
|
|
|
if (listen(s, 128) == -1) {
|
|
|
|
# ifndef OPENSSL_SYS_WINDOWS
|
|
|
|
perror("listen");
|
|
|
|
# endif
|
|
|
|
unlink(path);
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
*sock = s;
|
|
|
|
ret = 1;
|
|
|
|
err:
|
|
|
|
if ((ret == 0) && (s != -1)) {
|
|
|
|
SHUTDOWN(s);
|
|
|
|
}
|
|
|
|
return (ret);
|
|
|
|
}
|
|
|
|
# endif
|
s_client/s_server: support unix domain sockets
The "-unix <path>" argument allows s_server and s_client to use a unix
domain socket in the filesystem instead of IPv4 ("-connect", "-port",
"-accept", etc). If s_server exits gracefully, such as when "-naccept"
is used and the requested number of SSL/TLS connections have occurred,
then the domain socket file is removed. On ctrl-C, it is likely that
the stale socket file will be left over, such that s_server would
normally fail to restart with the same arguments. For this reason,
s_server also supports an "-unlink" option, which will clean up any
stale socket file before starting.
If you have any reason to want encrypted IPC within an O/S instance,
this concept might come in handy. Otherwise it just demonstrates that
there is nothing about SSL/TLS that limits it to TCP/IP in any way.
(There might also be benchmarking and profiling use in this path, as
unix domain sockets are much lower overhead than connecting over local
IP addresses).
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
2014-04-26 05:22:54 +00:00
|
|
|
|
2000-03-12 23:27:14 +00:00
|
|
|
static int do_accept(int acc_sock, int *sock, char **host)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
struct hostent *h1, *h2;
|
|
|
|
static struct sockaddr_in from;
|
|
|
|
int len;
|
|
|
|
/* struct linger ling; */
|
|
|
|
|
|
|
|
if (!ssl_sock_init())
|
|
|
|
return (0);
|
|
|
|
|
|
|
|
# ifndef OPENSSL_SYS_WINDOWS
|
|
|
|
redoit:
|
|
|
|
# endif
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2015-05-04 22:00:15 +00:00
|
|
|
memset(&from, 0, sizeof(from));
|
2015-01-22 03:40:55 +00:00
|
|
|
len = sizeof(from);
|
|
|
|
/*
|
|
|
|
* Note: under VMS with SOCKETSHR the fourth parameter is currently of
|
|
|
|
* type (int *) whereas under other systems it is (void *) if you don't
|
|
|
|
* have a cast it will choke the compiler: if you do have a cast then you
|
|
|
|
* can either go for (int *) or (void *).
|
|
|
|
*/
|
|
|
|
ret = accept(acc_sock, (struct sockaddr *)&from, (void *)&len);
|
2015-09-30 08:15:03 +00:00
|
|
|
if (ret == (int)INVALID_SOCKET) {
|
2015-01-22 03:40:55 +00:00
|
|
|
# if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK))
|
|
|
|
int i;
|
|
|
|
i = WSAGetLastError();
|
|
|
|
BIO_printf(bio_err, "accept error %d\n", i);
|
|
|
|
# else
|
|
|
|
if (errno == EINTR) {
|
|
|
|
/*
|
|
|
|
* check_timeout();
|
|
|
|
*/
|
|
|
|
goto redoit;
|
|
|
|
}
|
2015-06-04 18:26:55 +00:00
|
|
|
BIO_printf(bio_err, "accept errno=%d, %s\n", errno, strerror(errno));
|
2015-01-22 03:40:55 +00:00
|
|
|
# endif
|
|
|
|
return (0);
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2015-01-22 03:40:55 +00:00
|
|
|
if (host == NULL)
|
|
|
|
goto end;
|
|
|
|
# ifndef BIT_FIELD_LIMITS
|
|
|
|
/* I should use WSAAsyncGetHostByName() under windows */
|
|
|
|
h1 = gethostbyaddr((char *)&from.sin_addr.s_addr,
|
|
|
|
sizeof(from.sin_addr.s_addr), AF_INET);
|
|
|
|
# else
|
|
|
|
h1 = gethostbyaddr((char *)&from.sin_addr,
|
|
|
|
sizeof(struct in_addr), AF_INET);
|
|
|
|
# endif
|
|
|
|
if (h1 == NULL) {
|
|
|
|
BIO_printf(bio_err, "bad gethostbyaddr\n");
|
|
|
|
*host = NULL;
|
|
|
|
/* return(0); */
|
|
|
|
} else {
|
2015-04-30 21:48:31 +00:00
|
|
|
*host = app_malloc(strlen(h1->h_name) + 1, "copy hostname");
|
Rename some BUF_xxx to OPENSSL_xxx
Rename BUF_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
to OPENSSL_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
Add #define's for the old names.
Add CRYPTO_{memdup,strndup}, called by OPENSSL_{memdup,strndup} macros.
Reviewed-by: Tim Hudson <tjh@openssl.org>
2015-12-16 21:12:24 +00:00
|
|
|
OPENSSL_strlcpy(*host, h1->h_name, strlen(h1->h_name) + 1);
|
2015-01-22 03:40:55 +00:00
|
|
|
|
2015-05-04 22:05:26 +00:00
|
|
|
h2 = gethostbyname(*host);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (h2 == NULL) {
|
|
|
|
BIO_printf(bio_err, "gethostbyname failure\n");
|
|
|
|
closesocket(ret);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
if (h2->h_addrtype != AF_INET) {
|
|
|
|
BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n");
|
|
|
|
closesocket(ret);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
end:
|
|
|
|
*sock = ret;
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
|
|
|
|
# ifndef NO_SYS_UN_H
|
s_client/s_server: support unix domain sockets
The "-unix <path>" argument allows s_server and s_client to use a unix
domain socket in the filesystem instead of IPv4 ("-connect", "-port",
"-accept", etc). If s_server exits gracefully, such as when "-naccept"
is used and the requested number of SSL/TLS connections have occurred,
then the domain socket file is removed. On ctrl-C, it is likely that
the stale socket file will be left over, such that s_server would
normally fail to restart with the same arguments. For this reason,
s_server also supports an "-unlink" option, which will clean up any
stale socket file before starting.
If you have any reason to want encrypted IPC within an O/S instance,
this concept might come in handy. Otherwise it just demonstrates that
there is nothing about SSL/TLS that limits it to TCP/IP in any way.
(There might also be benchmarking and profiling use in this path, as
unix domain sockets are much lower overhead than connecting over local
IP addresses).
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
2014-04-26 05:22:54 +00:00
|
|
|
static int do_accept_unix(int acc_sock, int *sock)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!ssl_sock_init())
|
|
|
|
return (0);
|
|
|
|
|
|
|
|
redoit:
|
|
|
|
ret = accept(acc_sock, NULL, NULL);
|
2015-09-30 08:15:03 +00:00
|
|
|
if (ret == (int)INVALID_SOCKET) {
|
2015-01-22 03:40:55 +00:00
|
|
|
if (errno == EINTR) {
|
|
|
|
/*
|
|
|
|
* check_timeout();
|
|
|
|
*/
|
|
|
|
goto redoit;
|
|
|
|
}
|
2015-06-04 18:26:55 +00:00
|
|
|
BIO_printf(bio_err, "accept errno=%d, %s\n", errno, strerror(errno));
|
2015-01-22 03:40:55 +00:00
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
*sock = ret;
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
# endif
|
s_client/s_server: support unix domain sockets
The "-unix <path>" argument allows s_server and s_client to use a unix
domain socket in the filesystem instead of IPv4 ("-connect", "-port",
"-accept", etc). If s_server exits gracefully, such as when "-naccept"
is used and the requested number of SSL/TLS connections have occurred,
then the domain socket file is removed. On ctrl-C, it is likely that
the stale socket file will be left over, such that s_server would
normally fail to restart with the same arguments. For this reason,
s_server also supports an "-unlink" option, which will clean up any
stale socket file before starting.
If you have any reason to want encrypted IPC within an O/S instance,
this concept might come in handy. Otherwise it just demonstrates that
there is nothing about SSL/TLS that limits it to TCP/IP in any way.
(There might also be benchmarking and profiling use in this path, as
unix domain sockets are much lower overhead than connecting over local
IP addresses).
Signed-off-by: Geoff Thorpe <geoff@openssl.org>
2014-04-26 05:22:54 +00:00
|
|
|
|
1999-04-19 21:31:43 +00:00
|
|
|
int extract_host_port(char *str, char **host_ptr, unsigned char *ip,
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
unsigned short *port_ptr)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
char *h, *p;
|
|
|
|
|
|
|
|
h = str;
|
|
|
|
p = strchr(str, ':');
|
|
|
|
if (p == NULL) {
|
|
|
|
BIO_printf(bio_err, "no port defined\n");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
*(p++) = '\0';
|
|
|
|
|
|
|
|
if ((ip != NULL) && !host_ip(str, ip))
|
|
|
|
goto err;
|
|
|
|
if (host_ptr != NULL)
|
|
|
|
*host_ptr = h;
|
|
|
|
|
|
|
|
if (!extract_port(p, port_ptr))
|
|
|
|
goto err;
|
|
|
|
return (1);
|
|
|
|
err:
|
|
|
|
return (0);
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
2014-04-25 18:27:02 +00:00
|
|
|
static int host_ip(const char *str, unsigned char ip[4])
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
unsigned int in[4];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (sscanf(str, "%u.%u.%u.%u", &(in[0]), &(in[1]), &(in[2]), &(in[3])) ==
|
|
|
|
4) {
|
|
|
|
for (i = 0; i < 4; i++)
|
|
|
|
if (in[i] > 255) {
|
|
|
|
BIO_printf(bio_err, "invalid IP address\n");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
ip[0] = in[0];
|
|
|
|
ip[1] = in[1];
|
|
|
|
ip[2] = in[2];
|
|
|
|
ip[3] = in[3];
|
|
|
|
} else { /* do a gethostbyname */
|
|
|
|
struct hostent *he;
|
|
|
|
|
|
|
|
if (!ssl_sock_init())
|
|
|
|
return (0);
|
|
|
|
|
2015-05-04 22:05:26 +00:00
|
|
|
he = gethostbyname(str);
|
2015-01-22 03:40:55 +00:00
|
|
|
if (he == NULL) {
|
|
|
|
BIO_printf(bio_err, "gethostbyname failure\n");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (he->h_addrtype != AF_INET) {
|
|
|
|
BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n");
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
ip[0] = he->h_addr_list[0][0];
|
|
|
|
ip[1] = he->h_addr_list[0][1];
|
|
|
|
ip[2] = he->h_addr_list[0][2];
|
|
|
|
ip[3] = he->h_addr_list[0][3];
|
|
|
|
}
|
|
|
|
return (1);
|
|
|
|
err:
|
|
|
|
return (0);
|
|
|
|
}
|
1998-12-21 10:52:47 +00:00
|
|
|
|
Big apps cleanup (option-parsing, etc)
This is merges the old "rsalz-monolith" branch over to master. The biggest
change is that option parsing switch from cascasding 'else if strcmp("-foo")'
to a utility routine and somethin akin to getopt. Also, an error in the
command line no longer prints the full summary; use -help (or --help :)
for that. There have been many other changes and code-cleanup, see
bullet list below.
Special thanks to Matt for the long and detailed code review.
TEMPORARY:
For now, comment out CRYPTO_mem_leaks() at end of main
Tickets closed:
RT3515: Use 3DES in pkcs12 if built with no-rc2
RT1766: s_client -reconnect and -starttls broke
RT2932: Catch write errors
RT2604: port should be 'unsigned short'
RT2983: total_bytes undeclared #ifdef RENEG
RT1523: Add -nocert to fix output in x509 app
RT3508: Remove unused variable introduced by b09eb24
RT3511: doc fix; req default serial is random
RT1325,2973: Add more extensions to c_rehash
RT2119,3407: Updated to dgst.pod
RT2379: Additional typo fix
RT2693: Extra include of string.h
RT2880: HFS is case-insensitive filenames
RT3246: req command prints version number wrong
Other changes; incompatibilities marked with *:
Add SCSV support
Add -misalign to speed command
Make dhparam, dsaparam, ecparam, x509 output C in proper style
Make some internal ocsp.c functions void
Only display cert usages with -help in verify
Use global bio_err, remove "BIO*err" parameter from functions
For filenames, - always means stdin (or stdout as appropriate)
Add aliases for -des/aes "wrap" ciphers.
*Remove support for IISSGC (server gated crypto)
*The undocumented OCSP -header flag is now "-header name=value"
*Documented the OCSP -header flag
Reviewed-by: Matt Caswell <matt@openssl.org>
2015-04-24 19:26:15 +00:00
|
|
|
int extract_port(const char *str, unsigned short *port_ptr)
|
2015-01-22 03:40:55 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct servent *s;
|
|
|
|
|
|
|
|
i = atoi(str);
|
|
|
|
if (i != 0)
|
|
|
|
*port_ptr = (unsigned short)i;
|
|
|
|
else {
|
|
|
|
s = getservbyname(str, "tcp");
|
|
|
|
if (s == NULL) {
|
|
|
|
BIO_printf(bio_err, "getservbyname failure for %s\n", str);
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
*port_ptr = ntohs((unsigned short)s->s_port);
|
|
|
|
}
|
|
|
|
return (1);
|
|
|
|
}
|
|
|
|
|
2002-11-22 08:45:20 +00:00
|
|
|
#endif
|