2005-04-01 22:15:56 +02:00
|
|
|
/* Copyright 2003 Roger Dingledine.
|
2006-02-09 06:46:49 +01:00
|
|
|
* Copyright 2004-2006 Roger Dingledine, Nick Mathewson */
|
2003-09-04 18:05:08 +02:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
2005-12-14 21:40:40 +01:00
|
|
|
const char tortls_c_id[] =
|
|
|
|
"$Id$";
|
2003-09-04 18:05:08 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/**
|
|
|
|
* \file tortls.c
|
2005-06-11 07:31:17 +02:00
|
|
|
* \brief Wrapper functions to present a consistent interface to
|
|
|
|
* TLS, SSL, and X.509 functions from OpenSSL.
|
2004-05-10 05:53:24 +02:00
|
|
|
**/
|
2005-06-11 07:31:17 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/* (Unlike other tor functions, these
|
2003-09-04 18:05:08 +02:00
|
|
|
* are prefixed with tor_ in order to avoid conflicting with OpenSSL
|
|
|
|
* functions and variables.)
|
2004-05-10 05:53:24 +02:00
|
|
|
*/
|
2003-09-04 18:05:08 +02:00
|
|
|
|
2005-08-12 19:26:43 +02:00
|
|
|
#include "orconfig.h"
|
2003-09-04 18:05:08 +02:00
|
|
|
#include "./crypto.h"
|
|
|
|
#include "./tortls.h"
|
|
|
|
#include "./util.h"
|
2003-09-11 23:38:57 +02:00
|
|
|
#include "./log.h"
|
2004-04-03 06:05:12 +02:00
|
|
|
#include <string.h>
|
2003-09-04 18:05:08 +02:00
|
|
|
|
2003-10-19 02:46:51 +02:00
|
|
|
/* Copied from or.h */
|
2005-12-14 21:40:40 +01:00
|
|
|
#define LEGAL_NICKNAME_CHARACTERS \
|
|
|
|
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
|
2003-10-19 02:46:51 +02:00
|
|
|
|
2003-09-04 18:05:08 +02:00
|
|
|
#include <assert.h>
|
|
|
|
#include <openssl/ssl.h>
|
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <openssl/tls1.h>
|
|
|
|
#include <openssl/asn1.h>
|
|
|
|
#include <openssl/bio.h>
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** How long do identity certificates live? (sec) */
|
2004-04-25 00:17:50 +02:00
|
|
|
#define IDENTITY_CERT_LIFETIME (365*24*60*60)
|
2003-10-22 18:41:35 +02:00
|
|
|
|
2005-10-06 06:33:40 +02:00
|
|
|
/* DOCDOC */
|
|
|
|
typedef struct tor_tls_context_t {
|
2003-09-04 18:05:08 +02:00
|
|
|
SSL_CTX *ctx;
|
2005-10-06 06:33:40 +02:00
|
|
|
} tor_tls_context_t;
|
2003-09-04 18:05:08 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Holds a SSL object and its associated data. Members are only
|
2004-05-10 12:27:54 +02:00
|
|
|
* accessed from within tortls.c.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2005-10-06 06:33:40 +02:00
|
|
|
struct tor_tls_t {
|
2004-05-10 12:27:54 +02:00
|
|
|
SSL *ssl; /**< An OpenSSL SSL object. */
|
|
|
|
int socket; /**< The underlying file descriptor for this TLS connection. */
|
2003-12-17 22:14:13 +01:00
|
|
|
enum {
|
|
|
|
TOR_TLS_ST_HANDSHAKE, TOR_TLS_ST_OPEN, TOR_TLS_ST_GOTCLOSE,
|
2003-09-04 18:05:08 +02:00
|
|
|
TOR_TLS_ST_SENTCLOSE, TOR_TLS_ST_CLOSED
|
2004-05-10 05:53:24 +02:00
|
|
|
} state; /**< The current SSL state, depending on which operations have
|
2004-05-01 22:46:28 +02:00
|
|
|
* completed successfully. */
|
2003-09-04 18:05:08 +02:00
|
|
|
int isServer;
|
2005-12-14 21:40:40 +01:00
|
|
|
size_t wantwrite_n; /**< 0 normally, >0 if we returned wantwrite last
|
|
|
|
* time. */
|
2003-09-04 18:05:08 +02:00
|
|
|
};
|
|
|
|
|
2003-12-17 22:14:13 +01:00
|
|
|
static X509* tor_tls_create_certificate(crypto_pk_env_t *rsa,
|
2004-04-25 00:17:50 +02:00
|
|
|
crypto_pk_env_t *rsa_sign,
|
|
|
|
const char *cname,
|
|
|
|
const char *cname_sign,
|
|
|
|
unsigned int lifetime);
|
2003-09-25 07:17:11 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Global tls context. We keep it here because nobody else needs to
|
2004-05-10 12:27:54 +02:00
|
|
|
* touch it. */
|
2005-10-06 06:33:40 +02:00
|
|
|
static tor_tls_context_t *global_tls_context = NULL;
|
2004-05-10 05:53:24 +02:00
|
|
|
/** True iff tor_tls_init() has been called. */
|
2003-09-12 01:26:31 +02:00
|
|
|
static int tls_library_is_initialized = 0;
|
2003-09-08 08:22:19 +02:00
|
|
|
|
2004-05-01 22:46:28 +02:00
|
|
|
/* Module-internal error codes. */
|
2003-09-04 18:05:08 +02:00
|
|
|
#define _TOR_TLS_SYSCALL -6
|
|
|
|
#define _TOR_TLS_ZERORETURN -5
|
|
|
|
|
2003-09-10 02:47:39 +02:00
|
|
|
/* These functions are declared in crypto.c but not exported. */
|
2004-04-25 00:17:50 +02:00
|
|
|
EVP_PKEY *_crypto_pk_env_get_evp_pkey(crypto_pk_env_t *env, int private);
|
2003-09-10 02:47:39 +02:00
|
|
|
crypto_pk_env_t *_crypto_new_pk_env_rsa(RSA *rsa);
|
2004-04-03 04:40:30 +02:00
|
|
|
DH *_crypto_dh_env_get_dh(crypto_dh_env_t *dh);
|
2003-09-15 20:18:37 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Log all pending tls errors at level <b>severity</b>. Use
|
|
|
|
* <b>doing</b> to describe our current activities.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2003-09-15 20:18:37 +02:00
|
|
|
static void
|
2003-10-16 01:50:25 +02:00
|
|
|
tls_log_errors(int severity, const char *doing)
|
2003-09-15 20:18:37 +02:00
|
|
|
{
|
2003-10-16 01:50:25 +02:00
|
|
|
int err;
|
|
|
|
const char *msg, *lib, *func;
|
|
|
|
while ((err = ERR_get_error()) != 0) {
|
|
|
|
msg = (const char*)ERR_reason_error_string(err);
|
|
|
|
lib = (const char*)ERR_lib_error_string(err);
|
|
|
|
func = (const char*)ERR_func_error_string(err);
|
|
|
|
if (!msg) msg = "(null)";
|
|
|
|
if (doing) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log(severity, LD_NET, "TLS error while %s: %s (in %s:%s)",
|
|
|
|
doing, msg, lib,func);
|
2003-10-16 01:50:25 +02:00
|
|
|
} else {
|
2005-10-18 23:58:19 +02:00
|
|
|
log(severity, LD_NET, "TLS error: %s (in %s:%s)", msg, lib, func);
|
2003-10-16 01:50:25 +02:00
|
|
|
}
|
2003-09-15 20:18:37 +02:00
|
|
|
}
|
|
|
|
}
|
2003-09-10 02:47:39 +02:00
|
|
|
|
2003-09-16 22:53:09 +02:00
|
|
|
#define CATCH_SYSCALL 1
|
|
|
|
#define CATCH_ZERO 2
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Given a TLS object and the result of an SSL_* call, use
|
2004-05-01 22:46:28 +02:00
|
|
|
* SSL_get_error to determine whether an error has occurred, and if so
|
|
|
|
* which one. Return one of TOR_TLS_{DONE|WANTREAD|WANTWRITE|ERROR}.
|
|
|
|
* If extra&CATCH_SYSCALL is true, return _TOR_TLS_SYSCALL instead of
|
|
|
|
* reporting syscall errors. If extra&CATCH_ZERO is true, return
|
|
|
|
* _TOR_TLS_ZERORETURN instead of reporting zero-return errors.
|
|
|
|
*
|
2004-05-10 05:53:24 +02:00
|
|
|
* If an error has occurred, log it at level <b>severity</b> and describe the
|
|
|
|
* current action as <b>doing</b>.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2003-09-04 18:05:08 +02:00
|
|
|
static int
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_get_error(tor_tls_t *tls, int r, int extra,
|
2003-12-17 22:14:13 +01:00
|
|
|
const char *doing, int severity)
|
2003-09-04 18:05:08 +02:00
|
|
|
{
|
|
|
|
int err = SSL_get_error(tls->ssl, r);
|
|
|
|
switch (err) {
|
|
|
|
case SSL_ERROR_NONE:
|
|
|
|
return TOR_TLS_DONE;
|
|
|
|
case SSL_ERROR_WANT_READ:
|
|
|
|
return TOR_TLS_WANTREAD;
|
|
|
|
case SSL_ERROR_WANT_WRITE:
|
|
|
|
return TOR_TLS_WANTWRITE;
|
|
|
|
case SSL_ERROR_SYSCALL:
|
2003-09-16 22:53:09 +02:00
|
|
|
if (extra&CATCH_SYSCALL)
|
2003-12-17 22:14:13 +01:00
|
|
|
return _TOR_TLS_SYSCALL;
|
2004-05-01 22:46:28 +02:00
|
|
|
if (r == 0)
|
2005-10-18 23:58:19 +02:00
|
|
|
log(severity, LD_NET, "TLS error: unexpected close while %s", doing);
|
2004-05-01 22:46:28 +02:00
|
|
|
else {
|
|
|
|
int e = tor_socket_errno(tls->socket);
|
2005-12-14 21:40:40 +01:00
|
|
|
log(severity, LD_NET,
|
|
|
|
"TLS error: <syscall error while %s> (errno=%d: %s)",
|
2004-05-02 22:18:21 +02:00
|
|
|
doing, e, tor_socket_strerror(e));
|
2004-05-01 22:46:28 +02:00
|
|
|
}
|
2003-10-16 01:50:25 +02:00
|
|
|
tls_log_errors(severity, doing);
|
2003-09-16 22:53:09 +02:00
|
|
|
return TOR_TLS_ERROR;
|
2003-09-04 18:05:08 +02:00
|
|
|
case SSL_ERROR_ZERO_RETURN:
|
2003-09-16 22:53:09 +02:00
|
|
|
if (extra&CATCH_ZERO)
|
2003-12-17 22:14:13 +01:00
|
|
|
return _TOR_TLS_ZERORETURN;
|
2005-10-18 23:58:19 +02:00
|
|
|
log(severity, LD_NET, "TLS error: Zero return");
|
2003-10-16 01:50:25 +02:00
|
|
|
tls_log_errors(severity, doing);
|
2003-09-16 22:53:09 +02:00
|
|
|
return TOR_TLS_ERROR;
|
2003-09-04 18:05:08 +02:00
|
|
|
default:
|
2003-10-16 01:50:25 +02:00
|
|
|
tls_log_errors(severity, doing);
|
2003-09-04 18:05:08 +02:00
|
|
|
return TOR_TLS_ERROR;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Initialize OpenSSL, unless it has already been initialized.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2003-09-12 01:26:31 +02:00
|
|
|
static void
|
2005-06-21 03:07:32 +02:00
|
|
|
tor_tls_init(void)
|
|
|
|
{
|
2003-09-12 01:26:31 +02:00
|
|
|
if (!tls_library_is_initialized) {
|
|
|
|
SSL_library_init();
|
2003-09-15 21:38:52 +02:00
|
|
|
SSL_load_error_strings();
|
2005-06-20 20:56:35 +02:00
|
|
|
crypto_global_init(-1);
|
2003-09-12 01:26:31 +02:00
|
|
|
tls_library_is_initialized = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-02-11 02:41:19 +01:00
|
|
|
void
|
|
|
|
tor_tls_free_all(void)
|
|
|
|
{
|
|
|
|
if (global_tls_context) {
|
|
|
|
SSL_CTX_free(global_tls_context->ctx);
|
|
|
|
tor_free(global_tls_context);
|
|
|
|
global_tls_context = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** We need to give OpenSSL a callback to verify certificates. This is
|
2004-05-01 22:46:28 +02:00
|
|
|
* it: We always accept peer certs and complete the handshake. We
|
|
|
|
* don't validate them until later.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
static int
|
|
|
|
always_accept_verify_cb(int preverify_ok,
|
|
|
|
X509_STORE_CTX *x509_ctx)
|
2003-09-04 18:05:08 +02:00
|
|
|
{
|
2005-09-30 00:59:17 +02:00
|
|
|
/* avoid "unused parameter" warning. */
|
|
|
|
preverify_ok = 0;
|
|
|
|
x509_ctx = NULL;
|
2003-09-04 18:05:08 +02:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Generate and sign an X509 certificate with the public key <b>rsa</b>,
|
|
|
|
* signed by the private key <b>rsa_sign</b>. The commonName of the
|
|
|
|
* certificate will be <b>cname</b>; the commonName of the issuer will be
|
|
|
|
* <b>cname_sign</b>. The cert will be valid for <b>cert_lifetime</b> seconds
|
2004-05-01 22:46:28 +02:00
|
|
|
* starting from now. Return a certificate on success, NULL on
|
|
|
|
* failure.
|
2003-09-04 18:05:08 +02:00
|
|
|
*/
|
2004-05-01 22:46:28 +02:00
|
|
|
static X509 *
|
2003-12-17 22:14:13 +01:00
|
|
|
tor_tls_create_certificate(crypto_pk_env_t *rsa,
|
2004-04-25 00:17:50 +02:00
|
|
|
crypto_pk_env_t *rsa_sign,
|
|
|
|
const char *cname,
|
|
|
|
const char *cname_sign,
|
|
|
|
unsigned int cert_lifetime)
|
2003-09-04 18:05:08 +02:00
|
|
|
{
|
|
|
|
time_t start_time, end_time;
|
2004-04-25 00:17:50 +02:00
|
|
|
EVP_PKEY *sign_pkey = NULL, *pkey=NULL;
|
2003-09-04 18:05:08 +02:00
|
|
|
X509 *x509 = NULL;
|
2004-04-25 00:17:50 +02:00
|
|
|
X509_NAME *name = NULL, *name_issuer=NULL;
|
2003-09-04 18:05:08 +02:00
|
|
|
int nid;
|
2003-12-17 22:14:13 +01:00
|
|
|
|
2003-09-12 01:26:31 +02:00
|
|
|
tor_tls_init();
|
|
|
|
|
2003-09-04 18:05:08 +02:00
|
|
|
start_time = time(NULL);
|
|
|
|
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(rsa);
|
|
|
|
tor_assert(cname);
|
|
|
|
tor_assert(rsa_sign);
|
|
|
|
tor_assert(cname_sign);
|
2004-04-25 00:17:50 +02:00
|
|
|
if (!(sign_pkey = _crypto_pk_env_get_evp_pkey(rsa_sign,1)))
|
|
|
|
goto error;
|
|
|
|
if (!(pkey = _crypto_pk_env_get_evp_pkey(rsa,0)))
|
|
|
|
goto error;
|
2003-09-04 18:05:08 +02:00
|
|
|
if (!(x509 = X509_new()))
|
2003-09-11 23:12:39 +02:00
|
|
|
goto error;
|
2003-09-04 18:05:08 +02:00
|
|
|
if (!(X509_set_version(x509, 2)))
|
2003-09-11 23:12:39 +02:00
|
|
|
goto error;
|
2003-09-04 18:05:08 +02:00
|
|
|
if (!(ASN1_INTEGER_set(X509_get_serialNumber(x509), (long)start_time)))
|
2003-09-11 23:12:39 +02:00
|
|
|
goto error;
|
2003-12-17 22:14:13 +01:00
|
|
|
|
2003-09-04 18:05:08 +02:00
|
|
|
if (!(name = X509_NAME_new()))
|
2003-09-11 23:12:39 +02:00
|
|
|
goto error;
|
2005-12-14 21:40:40 +01:00
|
|
|
if ((nid = OBJ_txt2nid("organizationName")) == NID_undef)
|
|
|
|
goto error;
|
2003-09-04 18:05:08 +02:00
|
|
|
if (!(X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC,
|
2006-05-24 02:21:55 +02:00
|
|
|
(unsigned char*)"Tor", -1, -1, 0)))
|
2005-12-14 21:40:40 +01:00
|
|
|
goto error;
|
2003-09-12 01:26:31 +02:00
|
|
|
if ((nid = OBJ_txt2nid("commonName")) == NID_undef) goto error;
|
2003-09-04 18:05:08 +02:00
|
|
|
if (!(X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC,
|
2005-12-14 21:40:40 +01:00
|
|
|
(unsigned char*)cname, -1, -1, 0)))
|
|
|
|
goto error;
|
2004-04-25 00:17:50 +02:00
|
|
|
if (!(X509_set_subject_name(x509, name)))
|
|
|
|
goto error;
|
2003-12-17 22:14:13 +01:00
|
|
|
|
2004-04-25 00:17:50 +02:00
|
|
|
if (!(name_issuer = X509_NAME_new()))
|
2003-09-11 23:12:39 +02:00
|
|
|
goto error;
|
2005-12-14 21:40:40 +01:00
|
|
|
if ((nid = OBJ_txt2nid("organizationName")) == NID_undef)
|
|
|
|
goto error;
|
2004-04-25 00:17:50 +02:00
|
|
|
if (!(X509_NAME_add_entry_by_NID(name_issuer, nid, MBSTRING_ASC,
|
2006-05-24 02:21:55 +02:00
|
|
|
(unsigned char*)"Tor", -1, -1, 0)))
|
2005-12-14 21:40:40 +01:00
|
|
|
goto error;
|
2004-04-25 00:17:50 +02:00
|
|
|
if ((nid = OBJ_txt2nid("commonName")) == NID_undef) goto error;
|
|
|
|
if (!(X509_NAME_add_entry_by_NID(name_issuer, nid, MBSTRING_ASC,
|
2005-12-14 21:40:40 +01:00
|
|
|
(unsigned char*)cname_sign, -1, -1, 0)))
|
|
|
|
goto error;
|
2004-04-25 00:17:50 +02:00
|
|
|
if (!(X509_set_issuer_name(x509, name_issuer)))
|
2003-09-11 23:12:39 +02:00
|
|
|
goto error;
|
2004-04-25 00:17:50 +02:00
|
|
|
|
2003-09-04 18:05:08 +02:00
|
|
|
if (!X509_time_adj(X509_get_notBefore(x509),0,&start_time))
|
2003-09-11 23:12:39 +02:00
|
|
|
goto error;
|
2004-04-25 00:17:50 +02:00
|
|
|
end_time = start_time + cert_lifetime;
|
2003-09-04 18:05:08 +02:00
|
|
|
if (!X509_time_adj(X509_get_notAfter(x509),0,&end_time))
|
2003-09-11 23:12:39 +02:00
|
|
|
goto error;
|
2003-09-04 18:05:08 +02:00
|
|
|
if (!X509_set_pubkey(x509, pkey))
|
2003-09-11 23:12:39 +02:00
|
|
|
goto error;
|
2004-04-25 00:17:50 +02:00
|
|
|
if (!X509_sign(x509, sign_pkey, EVP_sha1()))
|
2003-09-11 23:12:39 +02:00
|
|
|
goto error;
|
2003-09-15 21:38:52 +02:00
|
|
|
|
2003-09-11 23:12:39 +02:00
|
|
|
goto done;
|
|
|
|
error:
|
2003-11-18 07:52:25 +01:00
|
|
|
if (x509) {
|
2003-12-17 22:14:13 +01:00
|
|
|
X509_free(x509);
|
2003-11-18 07:52:25 +01:00
|
|
|
x509 = NULL;
|
|
|
|
}
|
2003-09-11 23:12:39 +02:00
|
|
|
done:
|
2005-04-23 16:26:02 +02:00
|
|
|
tls_log_errors(LOG_WARN, "generating certificate");
|
2004-04-25 00:17:50 +02:00
|
|
|
if (sign_pkey)
|
|
|
|
EVP_PKEY_free(sign_pkey);
|
2003-09-11 23:12:39 +02:00
|
|
|
if (pkey)
|
|
|
|
EVP_PKEY_free(pkey);
|
|
|
|
if (name)
|
|
|
|
X509_NAME_free(name);
|
2004-04-25 00:17:50 +02:00
|
|
|
if (name_issuer)
|
|
|
|
X509_NAME_free(name_issuer);
|
2003-09-25 07:17:11 +02:00
|
|
|
return x509;
|
2003-09-04 18:05:08 +02:00
|
|
|
}
|
|
|
|
|
2003-09-11 23:12:39 +02:00
|
|
|
#ifdef EVERYONE_HAS_AES
|
2004-01-20 03:14:12 +01:00
|
|
|
/* Everybody is running OpenSSL 0.9.7 or later, so no backward compatibility
|
2003-09-11 23:12:39 +02:00
|
|
|
* is needed. */
|
|
|
|
#define CIPHER_LIST TLS1_TXT_DHE_RSA_WITH_AES_128_SHA
|
|
|
|
#elif defined(TLS1_TXT_DHE_RSA_WITH_AES_128_SHA)
|
2003-12-17 22:14:13 +01:00
|
|
|
/* Some people are running OpenSSL before 0.9.7, but we aren't.
|
2003-09-11 23:12:39 +02:00
|
|
|
* We can support AES and 3DES.
|
|
|
|
*/
|
2003-09-15 21:38:52 +02:00
|
|
|
#define CIPHER_LIST (TLS1_TXT_DHE_RSA_WITH_AES_128_SHA ":" \
|
2003-12-17 22:14:13 +01:00
|
|
|
SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA)
|
2003-09-11 23:12:39 +02:00
|
|
|
#else
|
|
|
|
/* We're running OpenSSL before 0.9.7. We only support 3DES. */
|
|
|
|
#define CIPHER_LIST SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA
|
|
|
|
#endif
|
|
|
|
|
2006-06-07 08:10:54 +02:00
|
|
|
/** Create a new TLS context for use with Tor TLS handshakes.
|
|
|
|
* <b>identity</b> should be set to the identity key used to sign the
|
|
|
|
* certificate, and <b>nickname</b> set to the nickname to use.
|
|
|
|
*
|
2004-05-01 22:46:28 +02:00
|
|
|
* You can call this function multiple times. Each time you call it,
|
2004-07-22 00:11:11 +02:00
|
|
|
* it generates new certificates; all new connections will use
|
|
|
|
* the new SSL context.
|
2003-09-04 18:05:08 +02:00
|
|
|
*/
|
2003-09-08 08:22:19 +02:00
|
|
|
int
|
2006-06-07 08:10:54 +02:00
|
|
|
tor_tls_context_new(crypto_pk_env_t *identity, const char *nickname,
|
2004-04-25 00:17:50 +02:00
|
|
|
unsigned int key_lifetime)
|
2003-09-04 18:05:08 +02:00
|
|
|
{
|
2004-04-25 00:17:50 +02:00
|
|
|
crypto_pk_env_t *rsa = NULL;
|
2003-09-04 18:05:08 +02:00
|
|
|
crypto_dh_env_t *dh = NULL;
|
|
|
|
EVP_PKEY *pkey = NULL;
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_context_t *result = NULL;
|
2004-04-25 00:17:50 +02:00
|
|
|
X509 *cert = NULL, *idcert = NULL;
|
2004-10-27 07:53:07 +02:00
|
|
|
char nn2[128];
|
2004-10-19 20:17:12 +02:00
|
|
|
if (!nickname)
|
|
|
|
nickname = "null";
|
2004-10-27 08:37:34 +02:00
|
|
|
tor_snprintf(nn2, sizeof(nn2), "%s <identity>", nickname);
|
2003-12-17 22:14:13 +01:00
|
|
|
|
2003-09-12 01:26:31 +02:00
|
|
|
tor_tls_init();
|
|
|
|
|
2006-06-07 08:10:54 +02:00
|
|
|
/* Generate short-term RSA key. */
|
|
|
|
if (!(rsa = crypto_new_pk_env()))
|
|
|
|
goto error;
|
|
|
|
if (crypto_pk_generate_key(rsa)<0)
|
|
|
|
goto error;
|
|
|
|
/* Create certificate signed by identity key. */
|
|
|
|
cert = tor_tls_create_certificate(rsa, identity, nickname, nn2,
|
|
|
|
key_lifetime);
|
|
|
|
/* Create self-signed certificate for identity key. */
|
|
|
|
idcert = tor_tls_create_certificate(identity, identity, nn2, nn2,
|
|
|
|
IDENTITY_CERT_LIFETIME);
|
|
|
|
if (!cert || !idcert) {
|
|
|
|
log(LOG_WARN, LD_CRYPTO, "Error creating certificate");
|
|
|
|
goto error;
|
2003-09-25 07:17:11 +02:00
|
|
|
}
|
|
|
|
|
2005-10-06 06:33:40 +02:00
|
|
|
result = tor_malloc(sizeof(tor_tls_context_t));
|
2003-09-11 23:12:39 +02:00
|
|
|
#ifdef EVERYONE_HAS_AES
|
2006-06-07 08:21:11 +02:00
|
|
|
/* Tell OpenSSL to only use TLS1 */
|
|
|
|
if (!(result->ctx = SSL_CTX_new(TLSv1_method())))
|
|
|
|
goto error;
|
2003-09-11 23:12:39 +02:00
|
|
|
#else
|
2006-06-07 08:21:11 +02:00
|
|
|
/* Tell OpenSSL to use SSL3 or TLS1 but not SSL2. */
|
|
|
|
if (!(result->ctx = SSL_CTX_new(SSLv23_method())))
|
|
|
|
goto error;
|
|
|
|
SSL_CTX_set_options(result->ctx, SSL_OP_NO_SSLv2);
|
2004-07-22 06:53:34 +02:00
|
|
|
#endif
|
2006-06-07 08:21:11 +02:00
|
|
|
SSL_CTX_set_options(result->ctx, SSL_OP_SINGLE_DH_USE);
|
|
|
|
if (!SSL_CTX_set_cipher_list(result->ctx, CIPHER_LIST))
|
|
|
|
goto error;
|
|
|
|
if (cert && !SSL_CTX_use_certificate(result->ctx,cert))
|
|
|
|
goto error;
|
|
|
|
X509_free(cert); /* We just added a reference to cert. */
|
|
|
|
cert=NULL;
|
|
|
|
if (idcert && !SSL_CTX_add_extra_chain_cert(result->ctx,idcert))
|
|
|
|
goto error;
|
|
|
|
idcert=NULL; /* The context now owns the reference to idcert */
|
|
|
|
SSL_CTX_set_session_cache_mode(result->ctx, SSL_SESS_CACHE_OFF);
|
|
|
|
tor_assert(rsa);
|
|
|
|
if (!(pkey = _crypto_pk_env_get_evp_pkey(rsa,1)))
|
|
|
|
goto error;
|
|
|
|
if (!SSL_CTX_use_PrivateKey(result->ctx, pkey))
|
|
|
|
goto error;
|
|
|
|
EVP_PKEY_free(pkey);
|
|
|
|
pkey = NULL;
|
|
|
|
if (!SSL_CTX_check_private_key(result->ctx))
|
|
|
|
goto error;
|
|
|
|
dh = crypto_dh_new();
|
|
|
|
SSL_CTX_set_tmp_dh(result->ctx, _crypto_dh_env_get_dh(dh));
|
|
|
|
crypto_dh_free(dh);
|
|
|
|
SSL_CTX_set_verify(result->ctx, SSL_VERIFY_PEER,
|
|
|
|
always_accept_verify_cb);
|
|
|
|
/* let us realloc bufs that we're writing from */
|
|
|
|
SSL_CTX_set_mode(result->ctx, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
|
2003-10-23 16:20:51 +02:00
|
|
|
/* Free the old context if one exists. */
|
|
|
|
if (global_tls_context) {
|
|
|
|
/* This is safe even if there are open connections: OpenSSL does
|
|
|
|
* reference counting with SSL and SSL_CTX objects. */
|
2003-10-23 16:27:53 +02:00
|
|
|
SSL_CTX_free(global_tls_context->ctx);
|
2004-07-22 06:53:34 +02:00
|
|
|
tor_free(global_tls_context);
|
2003-10-23 16:20:51 +02:00
|
|
|
}
|
2003-09-08 08:22:19 +02:00
|
|
|
global_tls_context = result;
|
2004-12-07 07:48:02 +01:00
|
|
|
if (rsa)
|
|
|
|
crypto_free_pk_env(rsa);
|
2003-09-08 08:22:19 +02:00
|
|
|
return 0;
|
2003-09-11 23:12:39 +02:00
|
|
|
|
|
|
|
error:
|
2004-04-26 18:52:47 +02:00
|
|
|
tls_log_errors(LOG_WARN, "creating TLS context");
|
2003-09-11 23:12:39 +02:00
|
|
|
if (pkey)
|
|
|
|
EVP_PKEY_free(pkey);
|
2004-04-25 00:17:50 +02:00
|
|
|
if (rsa)
|
|
|
|
crypto_free_pk_env(rsa);
|
2003-09-11 23:12:39 +02:00
|
|
|
if (dh)
|
|
|
|
crypto_dh_free(dh);
|
|
|
|
if (result && result->ctx)
|
|
|
|
SSL_CTX_free(result->ctx);
|
|
|
|
if (result)
|
2005-09-30 22:47:58 +02:00
|
|
|
tor_free(result);
|
2004-05-18 17:35:21 +02:00
|
|
|
if (cert)
|
|
|
|
X509_free(cert);
|
|
|
|
if (idcert)
|
2004-12-07 08:48:16 +01:00
|
|
|
X509_free(idcert);
|
2003-09-11 23:12:39 +02:00
|
|
|
return -1;
|
2003-09-04 18:05:08 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Create a new TLS object from a file descriptor, and a flag to
|
|
|
|
* determine whether it is functioning as a server.
|
2003-09-04 18:05:08 +02:00
|
|
|
*/
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_t *
|
2006-06-07 08:21:11 +02:00
|
|
|
tor_tls_new(int sock, int isServer)
|
2003-09-04 18:05:08 +02:00
|
|
|
{
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_t *result = tor_malloc(sizeof(tor_tls_t));
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(global_tls_context); /* make sure somebody made it first */
|
2006-06-07 08:21:11 +02:00
|
|
|
if (!(result->ssl = SSL_new(global_tls_context->ctx))) {
|
2005-04-23 16:26:02 +02:00
|
|
|
tls_log_errors(LOG_WARN, "generating TLS context");
|
|
|
|
tor_free(result);
|
2003-09-04 18:05:08 +02:00
|
|
|
return NULL;
|
2005-04-23 16:26:02 +02:00
|
|
|
}
|
2003-09-04 18:05:08 +02:00
|
|
|
result->socket = sock;
|
|
|
|
SSL_set_fd(result->ssl, sock);
|
|
|
|
result->state = TOR_TLS_ST_HANDSHAKE;
|
|
|
|
result->isServer = isServer;
|
2003-10-18 10:00:19 +02:00
|
|
|
result->wantwrite_n = 0;
|
2005-04-23 16:26:02 +02:00
|
|
|
/* Not expected to get called. */
|
|
|
|
tls_log_errors(LOG_WARN, "generating TLS context");
|
2003-09-04 18:05:08 +02:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2005-03-31 09:46:38 +02:00
|
|
|
/** Return whether this tls initiated the connect (client) or
|
|
|
|
* received it (server). */
|
|
|
|
int
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_is_server(tor_tls_t *tls)
|
2005-03-31 09:46:38 +02:00
|
|
|
{
|
|
|
|
tor_assert(tls);
|
|
|
|
return tls->isServer;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Release resources associated with a TLS object. Does not close the
|
2003-09-04 18:05:08 +02:00
|
|
|
* underlying file descriptor.
|
|
|
|
*/
|
|
|
|
void
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_free(tor_tls_t *tls)
|
2003-09-04 18:05:08 +02:00
|
|
|
{
|
2005-02-28 03:52:51 +01:00
|
|
|
tor_assert(tls && tls->ssl);
|
2003-09-04 18:05:08 +02:00
|
|
|
SSL_free(tls->ssl);
|
2005-02-28 03:52:51 +01:00
|
|
|
tls->ssl = NULL;
|
|
|
|
tor_free(tls);
|
2003-09-04 18:05:08 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Underlying function for TLS reading. Reads up to <b>len</b>
|
|
|
|
* characters from <b>tls</b> into <b>cp</b>. On success, returns the
|
|
|
|
* number of characters read. On failure, returns TOR_TLS_ERROR,
|
|
|
|
* TOR_TLS_CLOSE, TOR_TLS_WANTREAD, or TOR_TLS_WANTWRITE.
|
2003-09-04 18:05:08 +02:00
|
|
|
*/
|
|
|
|
int
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_read(tor_tls_t *tls, char *cp, size_t len)
|
2003-09-04 18:05:08 +02:00
|
|
|
{
|
|
|
|
int r, err;
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(tls);
|
|
|
|
tor_assert(tls->ssl);
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(tls->state == TOR_TLS_ST_OPEN);
|
2003-09-04 18:05:08 +02:00
|
|
|
r = SSL_read(tls->ssl, cp, len);
|
|
|
|
if (r > 0)
|
|
|
|
return r;
|
2005-10-17 18:21:42 +02:00
|
|
|
err = tor_tls_get_error(tls, r, CATCH_ZERO, "reading", LOG_DEBUG);
|
2003-09-16 22:53:09 +02:00
|
|
|
if (err == _TOR_TLS_ZERORETURN) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_debug(LD_NET,"read returned r=%d; TLS is closed",r);
|
2003-09-04 18:05:08 +02:00
|
|
|
tls->state = TOR_TLS_ST_CLOSED;
|
|
|
|
return TOR_TLS_CLOSE;
|
|
|
|
} else {
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(err != TOR_TLS_DONE);
|
2006-02-13 09:01:59 +01:00
|
|
|
log_debug(LD_NET,"read returned r=%d, err=%d",r,err);
|
2003-09-04 18:05:08 +02:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Underlying function for TLS writing. Write up to <b>n</b>
|
|
|
|
* characters from <b>cp</b> onto <b>tls</b>. On success, returns the
|
|
|
|
* number of characters written. On failure, returns TOR_TLS_ERROR,
|
|
|
|
* TOR_TLS_WANTREAD, or TOR_TLS_WANTWRITE.
|
2003-09-04 18:05:08 +02:00
|
|
|
*/
|
|
|
|
int
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_write(tor_tls_t *tls, char *cp, size_t n)
|
2003-09-04 18:05:08 +02:00
|
|
|
{
|
|
|
|
int r, err;
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(tls);
|
|
|
|
tor_assert(tls->ssl);
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(tls->state == TOR_TLS_ST_OPEN);
|
2003-09-11 23:38:57 +02:00
|
|
|
if (n == 0)
|
|
|
|
return 0;
|
2004-11-28 10:05:49 +01:00
|
|
|
if (tls->wantwrite_n) {
|
2003-10-18 10:00:19 +02:00
|
|
|
/* if WANTWRITE last time, we must use the _same_ n as before */
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(n >= tls->wantwrite_n);
|
2006-02-13 09:01:59 +01:00
|
|
|
log_debug(LD_NET,"resuming pending-write, (%d to flush, reusing %d)",
|
|
|
|
(int)n, (int)tls->wantwrite_n);
|
2003-10-18 10:00:19 +02:00
|
|
|
n = tls->wantwrite_n;
|
|
|
|
tls->wantwrite_n = 0;
|
|
|
|
}
|
2003-09-04 18:05:08 +02:00
|
|
|
r = SSL_write(tls->ssl, cp, n);
|
2003-09-27 00:27:24 +02:00
|
|
|
err = tor_tls_get_error(tls, r, 0, "writing", LOG_INFO);
|
2003-09-11 23:38:57 +02:00
|
|
|
if (err == TOR_TLS_DONE) {
|
2003-09-04 18:05:08 +02:00
|
|
|
return r;
|
2003-10-18 10:00:19 +02:00
|
|
|
}
|
2003-10-19 02:39:48 +02:00
|
|
|
if (err == TOR_TLS_WANTWRITE || err == TOR_TLS_WANTREAD) {
|
2003-10-18 10:00:19 +02:00
|
|
|
tls->wantwrite_n = n;
|
|
|
|
}
|
|
|
|
return err;
|
2003-09-04 18:05:08 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Perform initial handshake on <b>tls</b>. When finished, returns
|
2003-09-04 18:05:08 +02:00
|
|
|
* TOR_TLS_DONE. On failure, returns TOR_TLS_ERROR, TOR_TLS_WANTREAD,
|
2003-09-11 22:10:39 +02:00
|
|
|
* or TOR_TLS_WANTWRITE.
|
2003-09-04 18:05:08 +02:00
|
|
|
*/
|
|
|
|
int
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_handshake(tor_tls_t *tls)
|
2003-09-04 18:05:08 +02:00
|
|
|
{
|
|
|
|
int r;
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(tls);
|
|
|
|
tor_assert(tls->ssl);
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(tls->state == TOR_TLS_ST_HANDSHAKE);
|
2005-04-23 22:35:38 +02:00
|
|
|
check_no_tls_errors();
|
2003-09-04 18:05:08 +02:00
|
|
|
if (tls->isServer) {
|
|
|
|
r = SSL_accept(tls->ssl);
|
|
|
|
} else {
|
|
|
|
r = SSL_connect(tls->ssl);
|
|
|
|
}
|
2003-09-27 00:27:24 +02:00
|
|
|
r = tor_tls_get_error(tls,r,0, "handshaking", LOG_INFO);
|
2005-04-23 22:35:38 +02:00
|
|
|
if (ERR_peek_error() != 0) {
|
|
|
|
tls_log_errors(LOG_WARN, "handshaking");
|
|
|
|
return TOR_TLS_ERROR;
|
|
|
|
}
|
2003-09-04 18:05:08 +02:00
|
|
|
if (r == TOR_TLS_DONE) {
|
2003-12-17 22:14:13 +01:00
|
|
|
tls->state = TOR_TLS_ST_OPEN;
|
2004-04-26 18:52:47 +02:00
|
|
|
}
|
2003-09-04 18:05:08 +02:00
|
|
|
return r;
|
|
|
|
}
|
2003-12-17 22:14:13 +01:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Shut down an open tls connection <b>tls</b>. When finished, returns
|
2003-09-04 18:05:08 +02:00
|
|
|
* TOR_TLS_DONE. On failure, returns TOR_TLS_ERROR, TOR_TLS_WANTREAD,
|
|
|
|
* or TOR_TLS_WANTWRITE.
|
|
|
|
*/
|
|
|
|
int
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_shutdown(tor_tls_t *tls)
|
2003-09-04 18:05:08 +02:00
|
|
|
{
|
|
|
|
int r, err;
|
|
|
|
char buf[128];
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(tls);
|
|
|
|
tor_assert(tls->ssl);
|
2003-09-04 18:05:08 +02:00
|
|
|
|
2003-09-11 23:38:57 +02:00
|
|
|
while (1) {
|
|
|
|
if (tls->state == TOR_TLS_ST_SENTCLOSE) {
|
|
|
|
/* If we've already called shutdown once to send a close message,
|
|
|
|
* we read until the other side has closed too.
|
|
|
|
*/
|
|
|
|
do {
|
2003-12-17 22:14:13 +01:00
|
|
|
r = SSL_read(tls->ssl, buf, 128);
|
2003-09-11 23:38:57 +02:00
|
|
|
} while (r>0);
|
2003-12-17 22:14:13 +01:00
|
|
|
err = tor_tls_get_error(tls, r, CATCH_ZERO, "reading to shut down",
|
|
|
|
LOG_INFO);
|
2003-09-11 23:38:57 +02:00
|
|
|
if (err == _TOR_TLS_ZERORETURN) {
|
2003-12-17 22:14:13 +01:00
|
|
|
tls->state = TOR_TLS_ST_GOTCLOSE;
|
|
|
|
/* fall through... */
|
2003-09-11 23:38:57 +02:00
|
|
|
} else {
|
2003-12-17 22:14:13 +01:00
|
|
|
return err;
|
2003-09-11 23:38:57 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
r = SSL_shutdown(tls->ssl);
|
|
|
|
if (r == 1) {
|
|
|
|
/* If shutdown returns 1, the connection is entirely closed. */
|
|
|
|
tls->state = TOR_TLS_ST_CLOSED;
|
|
|
|
return TOR_TLS_DONE;
|
|
|
|
}
|
2003-12-17 22:14:13 +01:00
|
|
|
err = tor_tls_get_error(tls, r, CATCH_SYSCALL|CATCH_ZERO, "shutting down",
|
|
|
|
LOG_INFO);
|
2003-09-11 23:38:57 +02:00
|
|
|
if (err == _TOR_TLS_SYSCALL) {
|
|
|
|
/* The underlying TCP connection closed while we were shutting down. */
|
2003-12-17 22:14:13 +01:00
|
|
|
tls->state = TOR_TLS_ST_CLOSED;
|
2003-09-11 23:38:57 +02:00
|
|
|
return TOR_TLS_DONE;
|
|
|
|
} else if (err == _TOR_TLS_ZERORETURN) {
|
|
|
|
/* The TLS connection says that it sent a shutdown record, but
|
|
|
|
* isn't done shutting down yet. Make sure that this hasn't
|
|
|
|
* happened before, then go back to the start of the function
|
|
|
|
* and try to read.
|
|
|
|
*/
|
2003-12-17 22:14:13 +01:00
|
|
|
if (tls->state == TOR_TLS_ST_GOTCLOSE ||
|
|
|
|
tls->state == TOR_TLS_ST_SENTCLOSE) {
|
2005-10-18 23:58:19 +02:00
|
|
|
log(LOG_WARN, LD_NET,
|
2003-12-17 22:14:13 +01:00
|
|
|
"TLS returned \"half-closed\" value while already half-closed");
|
|
|
|
return TOR_TLS_ERROR;
|
2003-09-11 23:38:57 +02:00
|
|
|
}
|
|
|
|
tls->state = TOR_TLS_ST_SENTCLOSE;
|
|
|
|
/* fall through ... */
|
2003-09-04 18:05:08 +02:00
|
|
|
} else {
|
|
|
|
return err;
|
|
|
|
}
|
2003-09-11 23:38:57 +02:00
|
|
|
} /* end loop */
|
2003-09-04 18:05:08 +02:00
|
|
|
}
|
2003-09-08 08:22:19 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Return true iff this TLS connection is authenticated.
|
2003-09-10 02:47:39 +02:00
|
|
|
*/
|
|
|
|
int
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_peer_has_cert(tor_tls_t *tls)
|
2003-09-10 02:47:39 +02:00
|
|
|
{
|
|
|
|
X509 *cert;
|
2005-04-23 16:26:02 +02:00
|
|
|
cert = SSL_get_peer_certificate(tls->ssl);
|
|
|
|
tls_log_errors(LOG_WARN, "getting peer certificate");
|
|
|
|
if (!cert)
|
2003-09-10 02:47:39 +02:00
|
|
|
return 0;
|
|
|
|
X509_free(cert);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2005-01-03 18:53:20 +01:00
|
|
|
/** Write the nickname (if any) that the peer connected on <b>tls</b>
|
|
|
|
* claims to have into the first <b>buflen</b> characters of <b>buf</b>.
|
|
|
|
* Truncate the nickname if it is longer than buflen-1 characters. Always
|
|
|
|
* NUL-terminate. Return 0 on success, -1 on failure.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2003-10-19 02:46:51 +02:00
|
|
|
int
|
2006-05-26 18:32:16 +02:00
|
|
|
tor_tls_get_peer_cert_nickname(int severity, tor_tls_t *tls,
|
|
|
|
char *buf, size_t buflen)
|
2003-10-19 02:46:51 +02:00
|
|
|
{
|
|
|
|
X509 *cert = NULL;
|
|
|
|
X509_NAME *name = NULL;
|
|
|
|
int nid;
|
|
|
|
int lenout;
|
2005-04-23 16:26:02 +02:00
|
|
|
int r = -1;
|
2003-12-17 22:14:13 +01:00
|
|
|
|
2003-10-19 02:46:51 +02:00
|
|
|
if (!(cert = SSL_get_peer_certificate(tls->ssl))) {
|
2006-05-26 18:32:16 +02:00
|
|
|
log_fn(severity, LD_PROTOCOL, "Peer has no certificate");
|
2003-11-18 07:52:25 +01:00
|
|
|
goto error;
|
2003-10-19 02:46:51 +02:00
|
|
|
}
|
|
|
|
if (!(name = X509_get_subject_name(cert))) {
|
2006-05-26 18:32:16 +02:00
|
|
|
log_fn(severity, LD_PROTOCOL, "Peer certificate has no subject name");
|
2003-11-18 07:52:25 +01:00
|
|
|
goto error;
|
2003-10-19 02:46:51 +02:00
|
|
|
}
|
|
|
|
if ((nid = OBJ_txt2nid("commonName")) == NID_undef)
|
2003-11-18 07:52:25 +01:00
|
|
|
goto error;
|
2003-12-17 22:14:13 +01:00
|
|
|
|
2003-10-19 02:46:51 +02:00
|
|
|
lenout = X509_NAME_get_text_by_NID(name, nid, buf, buflen);
|
|
|
|
if (lenout == -1)
|
2003-11-18 07:52:25 +01:00
|
|
|
goto error;
|
2004-03-09 23:01:17 +01:00
|
|
|
if (((int)strspn(buf, LEGAL_NICKNAME_CHARACTERS)) < lenout) {
|
2006-05-26 18:32:16 +02:00
|
|
|
log_fn(severity, LD_PROTOCOL,
|
|
|
|
"Peer certificate nickname %s has illegal characters.",
|
|
|
|
escaped(buf));
|
2005-02-28 02:55:09 +01:00
|
|
|
if (strchr(buf, '.'))
|
2006-05-26 18:32:16 +02:00
|
|
|
log_fn(severity, LD_PROTOCOL,
|
|
|
|
" (Maybe it is not really running Tor at its "
|
|
|
|
"advertised OR port.)");
|
2003-11-18 07:52:25 +01:00
|
|
|
goto error;
|
2003-10-19 02:46:51 +02:00
|
|
|
}
|
2004-12-07 08:48:16 +01:00
|
|
|
|
2005-04-23 16:26:02 +02:00
|
|
|
r = 0;
|
|
|
|
|
2003-11-18 07:52:25 +01:00
|
|
|
error:
|
|
|
|
if (cert)
|
|
|
|
X509_free(cert);
|
2005-04-23 16:26:02 +02:00
|
|
|
|
2006-05-26 18:32:16 +02:00
|
|
|
tls_log_errors(severity, "getting peer certificate nickname");
|
2005-04-23 16:26:02 +02:00
|
|
|
return r;
|
2003-10-19 02:46:51 +02:00
|
|
|
}
|
|
|
|
|
2005-09-30 03:09:52 +02:00
|
|
|
static void
|
|
|
|
log_cert_lifetime(X509 *cert, const char *problem)
|
2004-07-21 19:59:24 +02:00
|
|
|
{
|
|
|
|
BIO *bio = NULL;
|
|
|
|
BUF_MEM *buf;
|
|
|
|
char *s1=NULL, *s2=NULL;
|
2004-07-23 01:06:28 +02:00
|
|
|
char mytime[33];
|
|
|
|
time_t now = time(NULL);
|
2005-02-22 08:03:03 +01:00
|
|
|
struct tm tm;
|
2004-07-21 19:59:24 +02:00
|
|
|
|
|
|
|
if (problem)
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"Certificate %s: is your system clock set incorrectly?",
|
|
|
|
problem);
|
2004-07-21 19:59:24 +02:00
|
|
|
|
|
|
|
if (!(bio = BIO_new(BIO_s_mem()))) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_GENERAL, "Couldn't allocate BIO!"); goto end;
|
2004-07-21 19:59:24 +02:00
|
|
|
}
|
|
|
|
if (!(ASN1_TIME_print(bio, X509_get_notBefore(cert)))) {
|
|
|
|
tls_log_errors(LOG_WARN, "printing certificate lifetime");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
BIO_get_mem_ptr(bio, &buf);
|
|
|
|
s1 = tor_strndup(buf->data, buf->length);
|
|
|
|
|
|
|
|
BIO_reset(bio);
|
|
|
|
if (!(ASN1_TIME_print(bio, X509_get_notAfter(cert)))) {
|
|
|
|
tls_log_errors(LOG_WARN, "printing certificate lifetime");
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
BIO_get_mem_ptr(bio, &buf);
|
|
|
|
s2 = tor_strndup(buf->data, buf->length);
|
|
|
|
|
2005-02-22 08:03:03 +01:00
|
|
|
strftime(mytime, 32, "%b %d %H:%M:%S %Y GMT", tor_gmtime_r(&now, &tm));
|
2004-07-23 01:06:28 +02:00
|
|
|
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_GENERAL,
|
|
|
|
"(certificate lifetime runs from %s through %s. Your time is %s.)",
|
|
|
|
s1,s2,mytime);
|
2004-07-21 19:59:24 +02:00
|
|
|
|
|
|
|
end:
|
2005-04-23 16:26:02 +02:00
|
|
|
/* Not expected to get invoked */
|
|
|
|
tls_log_errors(LOG_WARN, "getting certificate lifetime");
|
2004-07-21 19:59:24 +02:00
|
|
|
if (bio)
|
|
|
|
BIO_free(bio);
|
|
|
|
if (s1)
|
|
|
|
tor_free(s1);
|
|
|
|
if (s2)
|
|
|
|
tor_free(s2);
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** If the provided tls connection is authenticated and has a
|
2004-07-21 02:44:04 +02:00
|
|
|
* certificate that is currently valid and signed, then set
|
|
|
|
* *<b>identity_key</b> to the identity certificate's key and return
|
2005-10-17 02:35:53 +02:00
|
|
|
* 0. Else, return -1 and log complaints with log-level <b>severity</b>.
|
2003-09-10 02:47:39 +02:00
|
|
|
*/
|
2004-04-25 00:17:50 +02:00
|
|
|
int
|
2005-10-17 02:35:53 +02:00
|
|
|
tor_tls_verify(int severity, tor_tls_t *tls, crypto_pk_env_t **identity_key)
|
2003-09-10 02:47:39 +02:00
|
|
|
{
|
2004-07-21 02:44:04 +02:00
|
|
|
X509 *cert = NULL, *id_cert = NULL;
|
|
|
|
STACK_OF(X509) *chain = NULL;
|
2004-04-25 00:17:50 +02:00
|
|
|
EVP_PKEY *id_pkey = NULL;
|
2004-07-21 02:44:04 +02:00
|
|
|
RSA *rsa;
|
2004-07-22 00:11:11 +02:00
|
|
|
int num_in_chain;
|
2004-07-21 02:44:04 +02:00
|
|
|
int r = -1, i;
|
|
|
|
|
|
|
|
*identity_key = NULL;
|
2004-04-25 00:17:50 +02:00
|
|
|
|
2003-09-10 02:47:39 +02:00
|
|
|
if (!(cert = SSL_get_peer_certificate(tls->ssl)))
|
2004-07-21 02:44:04 +02:00
|
|
|
goto done;
|
|
|
|
if (!(chain = SSL_get_peer_cert_chain(tls->ssl)))
|
|
|
|
goto done;
|
2004-07-22 00:11:11 +02:00
|
|
|
num_in_chain = sk_X509_num(chain);
|
|
|
|
/* 1 means we're receiving (server-side), and it's just the id_cert.
|
|
|
|
* 2 means we're connecting (client-side), and it's both the link
|
|
|
|
* cert and the id_cert.
|
|
|
|
*/
|
|
|
|
if (num_in_chain < 1) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log_fn(severity,LD_PROTOCOL,
|
|
|
|
"Unexpected number of certificates in chain (%d)",
|
2004-07-22 00:11:11 +02:00
|
|
|
num_in_chain);
|
2004-07-21 02:44:04 +02:00
|
|
|
goto done;
|
|
|
|
}
|
2004-07-22 00:11:11 +02:00
|
|
|
for (i=0; i<num_in_chain; ++i) {
|
2004-07-21 02:44:04 +02:00
|
|
|
id_cert = sk_X509_value(chain, i);
|
|
|
|
if (X509_cmp(id_cert, cert) != 0)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!id_cert) {
|
2005-10-18 23:58:19 +02:00
|
|
|
log_fn(severity,LD_PROTOCOL,"No distinct identity certificate found");
|
2004-07-21 02:44:04 +02:00
|
|
|
goto done;
|
|
|
|
}
|
2003-12-17 22:14:13 +01:00
|
|
|
|
2004-07-21 02:44:04 +02:00
|
|
|
if (!(id_pkey = X509_get_pubkey(id_cert)) ||
|
2004-04-25 00:17:50 +02:00
|
|
|
X509_verify(cert, id_pkey) <= 0) {
|
2005-10-18 23:58:19 +02:00
|
|
|
log_fn(severity,LD_PROTOCOL,"X509_verify on cert and pkey returned <= 0");
|
2005-10-17 02:35:53 +02:00
|
|
|
tls_log_errors(severity,"verifying certificate");
|
2003-09-10 02:47:39 +02:00
|
|
|
goto done;
|
2003-10-18 08:48:46 +02:00
|
|
|
}
|
2003-09-10 02:47:39 +02:00
|
|
|
|
2004-07-21 02:44:04 +02:00
|
|
|
rsa = EVP_PKEY_get1_RSA(id_pkey);
|
|
|
|
if (!rsa)
|
|
|
|
goto done;
|
|
|
|
*identity_key = _crypto_new_pk_env_rsa(rsa);
|
|
|
|
|
2004-04-25 00:17:50 +02:00
|
|
|
r = 0;
|
2003-12-17 22:14:13 +01:00
|
|
|
|
2003-09-10 02:47:39 +02:00
|
|
|
done:
|
|
|
|
if (cert)
|
|
|
|
X509_free(cert);
|
2004-04-25 00:17:50 +02:00
|
|
|
if (id_pkey)
|
|
|
|
EVP_PKEY_free(id_pkey);
|
2004-04-26 04:33:12 +02:00
|
|
|
|
2004-05-18 17:35:21 +02:00
|
|
|
/* This should never get invoked, but let's make sure in case OpenSSL
|
|
|
|
* acts unexpectedly. */
|
2004-04-26 04:33:12 +02:00
|
|
|
tls_log_errors(LOG_WARN, "finishing tor_tls_verify");
|
|
|
|
|
2003-09-10 02:47:39 +02:00
|
|
|
return r;
|
|
|
|
}
|
2003-09-14 04:58:50 +02:00
|
|
|
|
2004-11-14 23:07:48 +01:00
|
|
|
/** Check whether the certificate set on the connection <b>tls</b> is
|
|
|
|
* expired or not-yet-valid, give or take <b>tolerance</b>
|
|
|
|
* seconds. Return 0 for valid, -1 for failure.
|
|
|
|
*
|
|
|
|
* NOTE: you should call tor_tls_verify before tor_tls_check_lifetime.
|
|
|
|
*/
|
|
|
|
int
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_check_lifetime(tor_tls_t *tls, int tolerance)
|
2004-11-14 23:07:48 +01:00
|
|
|
{
|
|
|
|
time_t now, t;
|
|
|
|
X509 *cert;
|
|
|
|
int r = -1;
|
|
|
|
|
|
|
|
now = time(NULL);
|
|
|
|
|
|
|
|
if (!(cert = SSL_get_peer_certificate(tls->ssl)))
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
t = now + tolerance;
|
|
|
|
if (X509_cmp_time(X509_get_notBefore(cert), &t) > 0) {
|
|
|
|
log_cert_lifetime(cert, "not yet valid");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
t = now - tolerance;
|
|
|
|
if (X509_cmp_time(X509_get_notAfter(cert), &t) < 0) {
|
|
|
|
log_cert_lifetime(cert, "already expired");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
r = 0;
|
|
|
|
done:
|
|
|
|
if (cert)
|
|
|
|
X509_free(cert);
|
2005-04-23 16:26:02 +02:00
|
|
|
/* Not expected to get invoked */
|
|
|
|
tls_log_errors(LOG_WARN, "checking certificate lifetime");
|
2004-11-14 23:07:48 +01:00
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Return the number of bytes available for reading from <b>tls</b>.
|
|
|
|
*/
|
2003-12-17 22:14:13 +01:00
|
|
|
int
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_get_pending_bytes(tor_tls_t *tls)
|
2003-09-27 22:07:40 +02:00
|
|
|
{
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(tls);
|
2004-04-27 01:19:21 +02:00
|
|
|
#if OPENSSL_VERSION_NUMBER < 0x0090700fl
|
|
|
|
if (tls->ssl->rstate == SSL_ST_READ_BODY)
|
|
|
|
return 0;
|
|
|
|
if (tls->ssl->s3->rrec.type != SSL3_RT_APPLICATION_DATA)
|
|
|
|
return 0;
|
|
|
|
#endif
|
2003-09-27 22:07:40 +02:00
|
|
|
return SSL_pending(tls->ssl);
|
2004-04-27 01:19:21 +02:00
|
|
|
|
2003-09-27 22:07:40 +02:00
|
|
|
}
|
2004-01-13 02:19:02 +01:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Return the number of bytes read across the underlying socket. */
|
2005-09-30 03:09:52 +02:00
|
|
|
unsigned long
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_get_n_bytes_read(tor_tls_t *tls)
|
2004-01-13 02:19:02 +01:00
|
|
|
{
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(tls);
|
2004-01-13 02:19:02 +01:00
|
|
|
return BIO_number_read(SSL_get_rbio(tls->ssl));
|
|
|
|
}
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Return the number of bytes written across the underlying socket. */
|
2005-09-30 03:09:52 +02:00
|
|
|
unsigned long
|
2005-10-06 06:33:40 +02:00
|
|
|
tor_tls_get_n_bytes_written(tor_tls_t *tls)
|
2004-01-13 02:19:02 +01:00
|
|
|
{
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(tls);
|
2004-01-13 02:19:02 +01:00
|
|
|
return BIO_number_written(SSL_get_wbio(tls->ssl));
|
|
|
|
}
|
2004-04-06 05:44:36 +02:00
|
|
|
|
2005-04-23 16:26:02 +02:00
|
|
|
/** Implement check_no_tls_errors: If there are any pending OpenSSL
|
2004-05-01 22:46:28 +02:00
|
|
|
* errors, log an error message and assert(0). */
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
_check_no_tls_errors(const char *fname, int line)
|
2004-04-27 01:00:07 +02:00
|
|
|
{
|
|
|
|
if (ERR_peek_error() == 0)
|
|
|
|
return;
|
2005-10-25 09:05:03 +02:00
|
|
|
log(LOG_WARN, LD_CRYPTO, "Unhandled OpenSSL errors found at %s:%d: ",
|
|
|
|
tor_fix_source_file(fname), line);
|
2005-04-23 16:35:13 +02:00
|
|
|
tls_log_errors(LOG_WARN, NULL);
|
2004-04-27 01:00:07 +02:00
|
|
|
}
|
2005-06-09 21:03:31 +02:00
|
|
|
|