2006-02-09 06:46:49 +01:00
|
|
|
/* Copyright (c) 2001 Matej Pfajfar.
|
|
|
|
* Copyright (c) 2001-2004, Roger Dingledine.
|
2007-02-12 22:39:53 +01:00
|
|
|
* Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson. */
|
2002-07-24 16:02:39 +02:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
2005-12-14 21:40:40 +01:00
|
|
|
const char crypto_c_id[] =
|
|
|
|
"$Id$";
|
2002-07-24 16:02:39 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/**
|
|
|
|
* \file crypto.c
|
2005-06-11 07:31:17 +02:00
|
|
|
* \brief Wrapper functions to present a consistent interface to
|
|
|
|
* public-key and symmetric cryptography operations from OpenSSL.
|
2004-05-10 05:53:24 +02:00
|
|
|
**/
|
|
|
|
|
2004-04-03 06:05:12 +02:00
|
|
|
#include "orconfig.h"
|
2004-03-11 07:19:08 +01:00
|
|
|
|
2004-04-28 22:13:21 +02:00
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
#define WIN32_WINNT 0x400
|
|
|
|
#define _WIN32_WINNT 0x400
|
|
|
|
#define WIN32_LEAN_AND_MEAN
|
|
|
|
#include <windows.h>
|
|
|
|
#include <wincrypt.h>
|
|
|
|
#endif
|
|
|
|
|
2002-08-22 09:30:03 +02:00
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include <openssl/err.h>
|
|
|
|
#include <openssl/rsa.h>
|
|
|
|
#include <openssl/pem.h>
|
|
|
|
#include <openssl/evp.h>
|
|
|
|
#include <openssl/rand.h>
|
2002-09-03 21:16:02 +02:00
|
|
|
#include <openssl/opensslv.h>
|
2003-05-01 02:53:46 +02:00
|
|
|
#include <openssl/bn.h>
|
|
|
|
#include <openssl/dh.h>
|
2004-04-03 04:40:30 +02:00
|
|
|
#include <openssl/rsa.h>
|
|
|
|
#include <openssl/dh.h>
|
2005-10-25 21:01:48 +02:00
|
|
|
#include <openssl/conf.h>
|
2002-07-24 16:02:39 +02:00
|
|
|
|
|
|
|
#include <stdlib.h>
|
2002-07-25 10:17:22 +02:00
|
|
|
#include <assert.h>
|
2003-04-16 17:24:09 +02:00
|
|
|
#include <stdio.h>
|
2003-11-12 05:28:30 +01:00
|
|
|
#include <limits.h>
|
2002-07-24 16:02:39 +02:00
|
|
|
|
2004-04-03 06:05:12 +02:00
|
|
|
#ifdef HAVE_CTYPE_H
|
|
|
|
#include <ctype.h>
|
|
|
|
#endif
|
2004-04-26 20:09:50 +02:00
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_FCNTL_H
|
|
|
|
#include <fcntl.h>
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_FCNTL_H
|
|
|
|
#include <sys/fcntl.h>
|
|
|
|
#endif
|
2004-04-03 06:05:12 +02:00
|
|
|
|
2007-05-01 00:42:50 +02:00
|
|
|
#define CRYPTO_PRIVATE
|
2002-08-22 09:30:03 +02:00
|
|
|
#include "crypto.h"
|
|
|
|
#include "log.h"
|
2003-06-30 21:18:32 +02:00
|
|
|
#include "aes.h"
|
2004-04-03 06:05:12 +02:00
|
|
|
#include "util.h"
|
2004-11-01 21:41:47 +01:00
|
|
|
#include "container.h"
|
2005-02-13 23:32:25 +01:00
|
|
|
#include "compat.h"
|
2002-08-22 09:30:03 +02:00
|
|
|
|
2002-09-03 21:16:02 +02:00
|
|
|
#if OPENSSL_VERSION_NUMBER < 0x00905000l
|
|
|
|
#error "We require openssl >= 0.9.5"
|
|
|
|
#endif
|
|
|
|
|
2005-09-10 00:07:15 +02:00
|
|
|
#if OPENSSL_VERSION_NUMBER < 0x00907000l
|
|
|
|
#define NO_ENGINES
|
|
|
|
#else
|
|
|
|
#include <openssl/engine.h>
|
|
|
|
#endif
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Macro: is k a valid RSA public or private key? */
|
2004-04-25 21:21:44 +02:00
|
|
|
#define PUBLIC_KEY_OK(k) ((k) && (k)->key && (k)->key->n)
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Macro: is k a valid RSA private key? */
|
2004-04-25 21:21:44 +02:00
|
|
|
#define PRIVATE_KEY_OK(k) ((k) && (k)->key && (k)->key->p)
|
|
|
|
|
2005-03-23 07:20:50 +01:00
|
|
|
#ifdef TOR_IS_MULTITHREADED
|
2006-09-29 20:13:37 +02:00
|
|
|
/** A number of prealloced mutexes for use by openssl. */
|
2005-03-23 07:20:50 +01:00
|
|
|
static tor_mutex_t **_openssl_mutexes = NULL;
|
2006-09-29 20:13:37 +02:00
|
|
|
/** How many mutexes have we allocated for use by openssl? */
|
2006-10-07 02:52:23 +02:00
|
|
|
static int _n_openssl_mutexes = 0;
|
2005-03-23 07:20:50 +01:00
|
|
|
#endif
|
|
|
|
|
2005-10-06 06:33:40 +02:00
|
|
|
/** A public key, or a public/private keypair. */
|
2003-09-10 02:47:24 +02:00
|
|
|
struct crypto_pk_env_t
|
|
|
|
{
|
2004-05-01 22:46:28 +02:00
|
|
|
int refs; /* reference counting so we don't have to copy keys */
|
2004-04-03 04:40:30 +02:00
|
|
|
RSA *key;
|
2003-09-10 02:47:24 +02:00
|
|
|
};
|
|
|
|
|
2005-10-06 06:33:40 +02:00
|
|
|
/** Key and stream information for a stream cipher. */
|
2003-09-10 02:47:24 +02:00
|
|
|
struct crypto_cipher_env_t
|
|
|
|
{
|
2005-05-07 07:55:06 +02:00
|
|
|
char key[CIPHER_KEY_LEN];
|
2004-04-03 04:40:30 +02:00
|
|
|
aes_cnt_cipher_t *cipher;
|
2003-09-10 02:47:24 +02:00
|
|
|
};
|
|
|
|
|
2005-10-06 06:33:40 +02:00
|
|
|
/** A structure to hold the first half (x, g^x) of a Diffie-Hellman handshake
|
|
|
|
* while we're waiting for the second.*/
|
2004-04-03 04:40:30 +02:00
|
|
|
struct crypto_dh_env_t {
|
|
|
|
DH *dh;
|
|
|
|
};
|
2003-06-13 23:13:37 +02:00
|
|
|
|
2005-02-13 23:32:25 +01:00
|
|
|
static int setup_openssl_threading(void);
|
2005-08-07 22:36:14 +02:00
|
|
|
static int tor_check_dh_key(BIGNUM *bn);
|
2005-02-13 23:32:25 +01:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Return the number of bytes added by padding method <b>padding</b>.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
static INLINE int
|
2005-09-30 03:09:52 +02:00
|
|
|
crypto_get_rsa_padding_overhead(int padding)
|
|
|
|
{
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (padding)
|
2003-03-19 21:41:15 +01:00
|
|
|
{
|
2004-04-03 04:40:30 +02:00
|
|
|
case RSA_NO_PADDING: return 0;
|
|
|
|
case RSA_PKCS1_OAEP_PADDING: return 42;
|
|
|
|
case RSA_PKCS1_PADDING: return 11;
|
2004-04-25 21:59:38 +02:00
|
|
|
default: tor_assert(0); return -1;
|
2003-03-19 21:41:15 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Given a padding method <b>padding</b>, return the correct OpenSSL constant.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2003-08-12 05:08:41 +02:00
|
|
|
static INLINE int
|
2005-09-30 03:09:52 +02:00
|
|
|
crypto_get_rsa_padding(int padding)
|
|
|
|
{
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (padding)
|
2004-04-01 05:08:35 +02:00
|
|
|
{
|
2004-04-03 04:40:30 +02:00
|
|
|
case PK_NO_PADDING: return RSA_NO_PADDING;
|
|
|
|
case PK_PKCS1_PADDING: return RSA_PKCS1_PADDING;
|
|
|
|
case PK_PKCS1_OAEP_PADDING: return RSA_PKCS1_OAEP_PADDING;
|
2004-04-25 21:59:38 +02:00
|
|
|
default: tor_assert(0); return -1;
|
2004-04-01 05:08:35 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Boolean: has OpenSSL's crypto been initialized? */
|
2003-09-15 21:38:52 +02:00
|
|
|
static int _crypto_global_initialized = 0;
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Log all pending crypto errors at level <b>severity</b>. Use
|
|
|
|
* <b>doing</b> to describe our current activities.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2004-04-26 20:09:50 +02:00
|
|
|
static void
|
|
|
|
crypto_log_errors(int severity, const char *doing)
|
|
|
|
{
|
2004-10-27 23:14:11 +02:00
|
|
|
unsigned int err;
|
2004-04-26 20:09:50 +02:00
|
|
|
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)";
|
2006-10-20 02:12:02 +02:00
|
|
|
if (!lib) lib = "(null)";
|
|
|
|
if (!func) func = "(null)";
|
2004-04-26 20:09:50 +02:00
|
|
|
if (doing) {
|
2005-12-14 21:40:40 +01:00
|
|
|
log(severity, LD_CRYPTO, "crypto error while %s: %s (in %s:%s)",
|
|
|
|
doing, msg, lib, func);
|
2004-04-26 20:09:50 +02:00
|
|
|
} else {
|
2005-10-18 23:58:19 +02:00
|
|
|
log(severity, LD_CRYPTO, "crypto error: %s (in %s:%s)", msg, lib, func);
|
2004-04-26 20:09:50 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2004-05-10 05:53:24 +02:00
|
|
|
|
2005-09-10 00:07:15 +02:00
|
|
|
#ifndef NO_ENGINES
|
2006-09-29 20:13:37 +02:00
|
|
|
/** Log any OpenSSL engines we're using at NOTICE. */
|
2005-06-20 20:56:35 +02:00
|
|
|
static void
|
|
|
|
log_engine(const char *fn, ENGINE *e)
|
|
|
|
{
|
|
|
|
if (e) {
|
|
|
|
const char *name, *id;
|
|
|
|
name = ENGINE_get_name(e);
|
|
|
|
id = ENGINE_get_id(e);
|
2005-10-18 23:58:19 +02:00
|
|
|
log(LOG_NOTICE, LD_CRYPTO, "Using OpenSSL engine %s [%s] for %s",
|
2005-06-20 20:56:35 +02:00
|
|
|
name?name:"?", id?id:"?", fn);
|
|
|
|
} else {
|
2005-10-18 23:58:19 +02:00
|
|
|
log(LOG_INFO, LD_CRYPTO, "Using default implementation for %s", fn);
|
2005-06-20 20:56:35 +02:00
|
|
|
}
|
|
|
|
}
|
2005-09-10 00:07:15 +02:00
|
|
|
#endif
|
2005-06-20 20:56:35 +02:00
|
|
|
|
2004-10-07 22:58:53 +02:00
|
|
|
/** Initialize the crypto library. Return 0 on success, -1 on failure.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2005-06-20 20:56:35 +02:00
|
|
|
int
|
|
|
|
crypto_global_init(int useAccel)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2003-09-15 21:38:52 +02:00
|
|
|
if (!_crypto_global_initialized) {
|
2005-06-20 20:56:35 +02:00
|
|
|
ERR_load_crypto_strings();
|
|
|
|
OpenSSL_add_all_algorithms();
|
|
|
|
_crypto_global_initialized = 1;
|
|
|
|
setup_openssl_threading();
|
2006-06-05 06:29:03 +02:00
|
|
|
/* XXX the below is a bug, since we can't know if we're supposed
|
|
|
|
* to be using hardware acceleration or not. we should arrange
|
|
|
|
* for this function to be called before init_keys. But make it
|
|
|
|
* not complain loudly, at least until we make acceleration work. */
|
2006-05-24 02:37:38 +02:00
|
|
|
if (useAccel < 0) {
|
2006-06-05 06:29:03 +02:00
|
|
|
log_info(LD_CRYPTO, "Initializing OpenSSL via tor_tls_init().");
|
2006-05-24 02:37:38 +02:00
|
|
|
}
|
2005-09-10 00:07:15 +02:00
|
|
|
#ifndef NO_ENGINES
|
2006-05-24 02:37:38 +02:00
|
|
|
if (useAccel > 0) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_info(LD_CRYPTO, "Initializing OpenSSL engine support.");
|
2005-06-20 20:56:35 +02:00
|
|
|
ENGINE_load_builtin_engines();
|
|
|
|
if (!ENGINE_register_all_complete())
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
/* XXXX make sure this isn't leaking. */
|
|
|
|
log_engine("RSA", ENGINE_get_default_RSA());
|
|
|
|
log_engine("DH", ENGINE_get_default_DH());
|
|
|
|
log_engine("RAND", ENGINE_get_default_RAND());
|
|
|
|
log_engine("SHA1", ENGINE_get_digest_engine(NID_sha1));
|
|
|
|
log_engine("3DES", ENGINE_get_cipher_engine(NID_des_ede3_ecb));
|
|
|
|
log_engine("AES", ENGINE_get_cipher_engine(NID_aes_128_ecb));
|
|
|
|
}
|
2005-09-10 00:07:15 +02:00
|
|
|
#endif
|
2003-09-15 21:38:52 +02:00
|
|
|
}
|
2002-07-24 16:02:39 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-10-25 21:01:48 +02:00
|
|
|
/** Free crypto resources held by this thread. */
|
|
|
|
void
|
|
|
|
crypto_thread_cleanup(void)
|
|
|
|
{
|
|
|
|
ERR_remove_state(0);
|
|
|
|
}
|
|
|
|
|
2004-10-07 22:58:53 +02:00
|
|
|
/** Uninitialize the crypto library. Return 0 on success, -1 on failure.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_global_cleanup(void)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2005-10-03 23:10:35 +02:00
|
|
|
EVP_cleanup();
|
2005-10-26 04:20:48 +02:00
|
|
|
ERR_remove_state(0);
|
2002-07-24 16:02:39 +02:00
|
|
|
ERR_free_strings();
|
2005-09-10 00:07:15 +02:00
|
|
|
#ifndef NO_ENGINES
|
2005-06-20 20:56:35 +02:00
|
|
|
ENGINE_cleanup();
|
2005-10-25 21:01:48 +02:00
|
|
|
CONF_modules_unload(1);
|
|
|
|
CRYPTO_cleanup_all_ex_data();
|
2005-11-16 06:22:44 +01:00
|
|
|
#endif
|
2005-03-23 07:20:50 +01:00
|
|
|
#ifdef TOR_IS_MULTITHREADED
|
|
|
|
if (_n_openssl_mutexes) {
|
2005-04-01 04:37:10 +02:00
|
|
|
int n = _n_openssl_mutexes;
|
|
|
|
tor_mutex_t **ms = _openssl_mutexes;
|
2005-03-23 07:20:50 +01:00
|
|
|
int i;
|
2005-04-01 04:37:10 +02:00
|
|
|
_openssl_mutexes = NULL;
|
2005-03-23 07:20:50 +01:00
|
|
|
_n_openssl_mutexes = 0;
|
2005-04-01 04:37:10 +02:00
|
|
|
for (i=0;i<n;++i) {
|
|
|
|
tor_mutex_free(ms[i]);
|
|
|
|
}
|
|
|
|
tor_free(ms);
|
2005-03-23 07:20:50 +01:00
|
|
|
}
|
|
|
|
#endif
|
2002-07-24 16:02:39 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** used by tortls.c: wrap an RSA* in a crypto_pk_env_t. */
|
2005-09-30 03:39:24 +02:00
|
|
|
crypto_pk_env_t *
|
|
|
|
_crypto_new_pk_env_rsa(RSA *rsa)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
|
|
|
crypto_pk_env_t *env;
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(rsa);
|
2004-04-03 04:40:30 +02:00
|
|
|
env = tor_malloc(sizeof(crypto_pk_env_t));
|
2002-09-24 12:43:57 +02:00
|
|
|
env->refs = 1;
|
2004-04-03 04:40:30 +02:00
|
|
|
env->key = rsa;
|
2003-09-10 02:47:24 +02:00
|
|
|
return env;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** used by tortls.c: get an equivalent EVP_PKEY* for a crypto_pk_env_t. Iff
|
2004-05-01 22:46:28 +02:00
|
|
|
* private is set, include the private-key portion of the key. */
|
2005-09-30 03:39:24 +02:00
|
|
|
EVP_PKEY *
|
|
|
|
_crypto_pk_env_get_evp_pkey(crypto_pk_env_t *env, int private)
|
2003-09-11 23:12:39 +02:00
|
|
|
{
|
|
|
|
RSA *key = NULL;
|
|
|
|
EVP_PKEY *pkey = NULL;
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(env->key);
|
2004-04-25 00:17:50 +02:00
|
|
|
if (private) {
|
|
|
|
if (!(key = RSAPrivateKey_dup(env->key)))
|
|
|
|
goto error;
|
|
|
|
} else {
|
|
|
|
if (!(key = RSAPublicKey_dup(env->key)))
|
|
|
|
goto error;
|
|
|
|
}
|
2003-09-11 23:12:39 +02:00
|
|
|
if (!(pkey = EVP_PKEY_new()))
|
|
|
|
goto error;
|
|
|
|
if (!(EVP_PKEY_assign_RSA(pkey, key)))
|
|
|
|
goto error;
|
|
|
|
return pkey;
|
|
|
|
error:
|
|
|
|
if (pkey)
|
|
|
|
EVP_PKEY_free(pkey);
|
|
|
|
if (key)
|
|
|
|
RSA_free(key);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Used by tortls.c: Get the DH* from a crypto_dh_env_t.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2005-09-30 03:39:24 +02:00
|
|
|
DH *
|
|
|
|
_crypto_dh_env_get_dh(crypto_dh_env_t *dh)
|
2004-04-03 04:40:30 +02:00
|
|
|
{
|
|
|
|
return dh->dh;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Allocate and return storage for a public key. The key itself will not yet
|
2004-05-01 22:46:28 +02:00
|
|
|
* be set.
|
|
|
|
*/
|
2005-09-30 03:39:24 +02:00
|
|
|
crypto_pk_env_t *
|
|
|
|
crypto_new_pk_env(void)
|
2003-09-10 02:47:24 +02:00
|
|
|
{
|
|
|
|
RSA *rsa;
|
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
rsa = RSA_new();
|
|
|
|
if (!rsa) return NULL;
|
|
|
|
return _crypto_new_pk_env_rsa(rsa);
|
2002-07-24 16:02:39 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Release a reference to an asymmetric key; when all the references
|
2004-05-01 23:41:23 +02:00
|
|
|
* are released, free the key.
|
2004-05-01 22:46:28 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
crypto_free_pk_env(crypto_pk_env_t *env)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(env);
|
2002-09-24 12:43:57 +02:00
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
if (--env->refs > 0)
|
2002-09-24 12:43:57 +02:00
|
|
|
return;
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
if (env->key)
|
|
|
|
RSA_free(env->key);
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2005-09-30 22:47:58 +02:00
|
|
|
tor_free(env);
|
2002-07-24 16:02:39 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Create a new symmetric cipher for a given key and encryption flag
|
2004-05-01 23:41:23 +02:00
|
|
|
* (1=encrypt, 0=decrypt). Return the crypto object on success; NULL
|
|
|
|
* on failure.
|
2002-10-02 22:39:51 +02:00
|
|
|
*/
|
|
|
|
crypto_cipher_env_t *
|
2004-04-28 22:31:32 +02:00
|
|
|
crypto_create_init_cipher(const char *key, int encrypt_mode)
|
2002-10-02 22:39:51 +02:00
|
|
|
{
|
|
|
|
int r;
|
|
|
|
crypto_cipher_env_t *crypto = NULL;
|
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
if (! (crypto = crypto_new_cipher_env())) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO, "Unable to allocate crypto object");
|
2002-10-02 22:39:51 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (crypto_cipher_set_key(crypto, key)) {
|
2004-04-26 20:09:50 +02:00
|
|
|
crypto_log_errors(LOG_WARN, "setting symmetric key");
|
2002-10-02 22:39:51 +02:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (encrypt_mode)
|
|
|
|
r = crypto_cipher_encrypt_init_cipher(crypto);
|
|
|
|
else
|
|
|
|
r = crypto_cipher_decrypt_init_cipher(crypto);
|
|
|
|
|
2004-04-26 20:09:50 +02:00
|
|
|
if (r)
|
2002-10-02 22:39:51 +02:00
|
|
|
goto error;
|
|
|
|
return crypto;
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (crypto)
|
|
|
|
crypto_free_cipher_env(crypto);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Allocate and return a new symmetric cipher.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:39:24 +02:00
|
|
|
crypto_cipher_env_t *
|
|
|
|
crypto_new_cipher_env(void)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
|
|
|
crypto_cipher_env_t *env;
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
env = tor_malloc_zero(sizeof(crypto_cipher_env_t));
|
|
|
|
env->cipher = aes_new_cipher();
|
2003-03-19 22:27:21 +01:00
|
|
|
return env;
|
2002-07-24 16:02:39 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Free a symmetric cipher.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
crypto_free_cipher_env(crypto_cipher_env_t *env)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(env);
|
2003-03-19 21:41:15 +01:00
|
|
|
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(env->cipher);
|
2004-04-03 04:40:30 +02:00
|
|
|
aes_free_cipher(env->cipher);
|
|
|
|
tor_free(env);
|
2002-07-24 16:02:39 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* public key crypto */
|
2004-05-01 23:41:23 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Generate a new public/private keypair in <b>env</b>. Return 0 on
|
2004-05-01 23:41:23 +02:00
|
|
|
* success, -1 on failure.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_pk_generate_key(crypto_pk_env_t *env)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(env);
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
if (env->key)
|
|
|
|
RSA_free(env->key);
|
2004-05-01 22:46:28 +02:00
|
|
|
env->key = RSA_generate_key(PK_BYTES*8,65537, NULL, NULL);
|
2004-04-26 20:09:50 +02:00
|
|
|
if (!env->key) {
|
|
|
|
crypto_log_errors(LOG_WARN, "generating RSA key");
|
2002-07-25 10:17:22 +02:00
|
|
|
return -1;
|
2004-04-26 20:09:50 +02:00
|
|
|
}
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2002-07-24 16:02:39 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-09-21 06:55:43 +02:00
|
|
|
/** Read a PEM-encoded private key from the string <b>s</b> into <b>env</b>.
|
2004-10-07 22:58:53 +02:00
|
|
|
* Return 0 on success, -1 on failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2007-06-13 20:15:53 +02:00
|
|
|
/* Used here, and used for testing. */
|
|
|
|
int
|
2005-09-30 03:09:52 +02:00
|
|
|
crypto_pk_read_private_key_from_string(crypto_pk_env_t *env,
|
|
|
|
const char *s)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2004-09-21 06:55:43 +02:00
|
|
|
BIO *b;
|
|
|
|
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(s);
|
2004-09-21 06:55:43 +02:00
|
|
|
|
|
|
|
/* Create a read-only memory BIO, backed by the nul-terminated string 's' */
|
|
|
|
b = BIO_new_mem_buf((char*)s, -1);
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
if (env->key)
|
|
|
|
RSA_free(env->key);
|
2004-09-21 06:55:43 +02:00
|
|
|
|
|
|
|
env->key = PEM_read_bio_RSAPrivateKey(b,NULL,NULL,NULL);
|
|
|
|
|
|
|
|
BIO_free(b);
|
|
|
|
|
2004-04-26 20:09:50 +02:00
|
|
|
if (!env->key) {
|
2004-09-21 06:55:43 +02:00
|
|
|
crypto_log_errors(LOG_WARN, "Error parsing private key");
|
2002-07-25 10:17:22 +02:00
|
|
|
return -1;
|
2004-04-26 20:09:50 +02:00
|
|
|
}
|
2002-07-24 16:02:39 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2002-08-22 09:30:03 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Read a PEM-encoded private key from the file named by
|
|
|
|
* <b>keyfile</b> into <b>env</b>. Return 0 on success, -1 on failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
2005-12-14 21:40:40 +01:00
|
|
|
crypto_pk_read_private_key_from_filename(crypto_pk_env_t *env,
|
|
|
|
const char *keyfile)
|
2002-08-22 09:30:03 +02:00
|
|
|
{
|
2004-09-21 06:55:43 +02:00
|
|
|
char *contents;
|
|
|
|
int r;
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2004-09-21 06:55:43 +02:00
|
|
|
/* Read the file into a string. */
|
2006-10-20 01:05:02 +02:00
|
|
|
contents = read_file_to_str(keyfile, 0, NULL);
|
2004-09-21 06:55:43 +02:00
|
|
|
if (!contents) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO, "Error reading private key from \"%s\"", keyfile);
|
2003-09-27 00:27:24 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2004-09-21 06:55:43 +02:00
|
|
|
/* Try to parse it. */
|
|
|
|
r = crypto_pk_read_private_key_from_string(env, contents);
|
|
|
|
tor_free(contents);
|
|
|
|
if (r)
|
|
|
|
return -1; /* read_private_key_from_string already warned, so we don't.*/
|
|
|
|
|
|
|
|
/* Make sure it's valid. */
|
2004-04-26 20:09:50 +02:00
|
|
|
if (crypto_pk_check_key(env) <= 0)
|
2002-07-25 10:17:22 +02:00
|
|
|
return -1;
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2002-07-24 16:02:39 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2002-07-25 10:17:22 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** PEM-encode the public key portion of <b>env</b> and write it to a
|
|
|
|
* newly allocated string. On success, set *<b>dest</b> to the new
|
|
|
|
* string, *<b>len</b> to the string's length, and return 0. On
|
|
|
|
* failure, return -1.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
2005-12-14 21:40:40 +01:00
|
|
|
crypto_pk_write_public_key_to_string(crypto_pk_env_t *env, char **dest,
|
|
|
|
size_t *len)
|
2005-09-30 03:09:52 +02:00
|
|
|
{
|
2002-09-24 12:43:57 +02:00
|
|
|
BUF_MEM *buf;
|
2003-12-16 06:29:04 +01:00
|
|
|
BIO *b;
|
2002-09-24 12:43:57 +02:00
|
|
|
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(env->key);
|
|
|
|
tor_assert(dest);
|
2002-09-24 12:43:57 +02:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
b = BIO_new(BIO_s_mem()); /* Create a memory BIO */
|
2002-09-24 12:43:57 +02:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
/* Now you can treat b as if it were a file. Just use the
|
|
|
|
* PEM_*_bio_* functions instead of the non-bio variants.
|
|
|
|
*/
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!PEM_write_bio_RSAPublicKey(b, env->key)) {
|
2004-04-26 20:09:50 +02:00
|
|
|
crypto_log_errors(LOG_WARN, "writing public key to string");
|
2004-04-03 04:40:30 +02:00
|
|
|
return -1;
|
2004-04-26 20:09:50 +02:00
|
|
|
}
|
2002-09-24 12:43:57 +02:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
BIO_get_mem_ptr(b, &buf);
|
2006-08-31 20:47:54 +02:00
|
|
|
(void)BIO_set_close(b, BIO_NOCLOSE); /* so BIO_free doesn't free buf */
|
2004-04-03 04:40:30 +02:00
|
|
|
BIO_free(b);
|
2002-09-24 12:43:57 +02:00
|
|
|
|
2004-10-13 07:54:58 +02:00
|
|
|
tor_assert(buf->length >= 0);
|
2004-04-03 04:40:30 +02:00
|
|
|
*dest = tor_malloc(buf->length+1);
|
|
|
|
memcpy(*dest, buf->data, buf->length);
|
2006-07-15 21:21:30 +02:00
|
|
|
(*dest)[buf->length] = 0; /* nul terminate it */
|
2004-04-03 04:40:30 +02:00
|
|
|
*len = buf->length;
|
|
|
|
BUF_MEM_free(buf);
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2002-09-24 12:43:57 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Read a PEM-encoded public key from the first <b>len</b> characters of
|
|
|
|
* <b>src</b>, and store the result in <b>env</b>. Return 0 on success, -1 on
|
2004-05-01 23:41:23 +02:00
|
|
|
* failure.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
2005-12-14 21:40:40 +01:00
|
|
|
crypto_pk_read_public_key_from_string(crypto_pk_env_t *env, const char *src,
|
|
|
|
size_t len)
|
2005-09-30 03:09:52 +02:00
|
|
|
{
|
2003-12-16 06:29:04 +01:00
|
|
|
BIO *b;
|
2002-09-24 12:43:57 +02:00
|
|
|
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(src);
|
2002-09-24 12:43:57 +02:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
b = BIO_new(BIO_s_mem()); /* Create a memory BIO */
|
2002-09-24 12:43:57 +02:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
BIO_write(b, src, len);
|
2002-09-24 12:43:57 +02:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
if (env->key)
|
|
|
|
RSA_free(env->key);
|
|
|
|
env->key = PEM_read_bio_RSAPublicKey(b, NULL, NULL, NULL);
|
2004-04-12 07:27:38 +02:00
|
|
|
BIO_free(b);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!env->key) {
|
2004-04-26 20:09:50 +02:00
|
|
|
crypto_log_errors(LOG_WARN, "reading public key from string");
|
2004-04-03 04:40:30 +02:00
|
|
|
return -1;
|
2004-04-26 20:09:50 +02:00
|
|
|
}
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2002-09-24 12:43:57 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-02-06 03:49:07 +01:00
|
|
|
/** Write the private key from <b>env</b> into the file named by <b>fname</b>,
|
2004-05-01 23:41:23 +02:00
|
|
|
* PEM-encoded. Return 0 on success, -1 on failure.
|
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
int
|
|
|
|
crypto_pk_write_private_key_to_filename(crypto_pk_env_t *env,
|
2003-09-26 20:27:35 +02:00
|
|
|
const char *fname)
|
|
|
|
{
|
|
|
|
BIO *bio;
|
|
|
|
char *cp;
|
|
|
|
long len;
|
2003-09-26 20:44:20 +02:00
|
|
|
char *s;
|
2003-09-26 20:27:35 +02:00
|
|
|
int r;
|
2004-04-03 04:40:30 +02:00
|
|
|
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(PRIVATE_KEY_OK(env));
|
2004-04-25 21:21:44 +02:00
|
|
|
|
2003-09-26 20:27:35 +02:00
|
|
|
if (!(bio = BIO_new(BIO_s_mem())))
|
|
|
|
return -1;
|
2004-04-03 04:40:30 +02:00
|
|
|
if (PEM_write_bio_RSAPrivateKey(bio, env->key, NULL,NULL,0,NULL,NULL)
|
2003-09-26 20:44:20 +02:00
|
|
|
== 0) {
|
2004-04-26 20:09:50 +02:00
|
|
|
crypto_log_errors(LOG_WARN, "writing private key");
|
2003-09-26 20:27:35 +02:00
|
|
|
BIO_free(bio);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
len = BIO_get_mem_data(bio, &cp);
|
2004-10-13 07:54:58 +02:00
|
|
|
tor_assert(len >= 0);
|
2003-09-26 20:44:20 +02:00
|
|
|
s = tor_malloc(len+1);
|
2005-01-03 23:35:40 +01:00
|
|
|
memcpy(s, cp, len);
|
|
|
|
s[len]='\0';
|
2004-09-08 09:16:34 +02:00
|
|
|
r = write_str_to_file(fname, s, 0);
|
2003-09-26 20:27:35 +02:00
|
|
|
BIO_free(bio);
|
2005-09-30 22:47:58 +02:00
|
|
|
tor_free(s);
|
2003-09-26 20:27:35 +02:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Return true iff <b>env</b> has a valid key.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_pk_check_key(crypto_pk_env_t *env)
|
2002-07-25 10:17:22 +02:00
|
|
|
{
|
2004-04-26 20:09:50 +02:00
|
|
|
int r;
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(env);
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2004-04-26 20:09:50 +02:00
|
|
|
r = RSA_check_key(env->key);
|
|
|
|
if (r <= 0)
|
|
|
|
crypto_log_errors(LOG_WARN,"checking RSA key");
|
|
|
|
return r;
|
2002-07-25 10:17:22 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Compare the public-key components of a and b. Return -1 if a\<b, 0
|
|
|
|
* if a==b, and 1 if a\>b.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_pk_cmp_keys(crypto_pk_env_t *a, crypto_pk_env_t *b)
|
|
|
|
{
|
2003-12-16 06:29:04 +01:00
|
|
|
int result;
|
|
|
|
|
2002-08-22 09:30:03 +02:00
|
|
|
if (!a || !b)
|
|
|
|
return -1;
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2002-08-22 09:30:03 +02:00
|
|
|
if (!a->key || !b->key)
|
|
|
|
return -1;
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(PUBLIC_KEY_OK(a));
|
|
|
|
tor_assert(PUBLIC_KEY_OK(b));
|
2004-04-03 04:40:30 +02:00
|
|
|
result = BN_cmp((a->key)->n, (b->key)->n);
|
|
|
|
if (result)
|
|
|
|
return result;
|
|
|
|
return BN_cmp((a->key)->e, (b->key)->e);
|
2002-08-22 09:30:03 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Return the size of the public key modulus in <b>env</b>, in bytes. */
|
2005-09-30 03:09:52 +02:00
|
|
|
size_t
|
|
|
|
crypto_pk_keysize(crypto_pk_env_t *env)
|
2002-08-22 09:30:03 +02:00
|
|
|
{
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(env->key);
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2005-05-07 07:55:06 +02:00
|
|
|
return (size_t) RSA_size(env->key);
|
2002-08-22 09:30:03 +02:00
|
|
|
}
|
2002-09-24 12:43:57 +02:00
|
|
|
|
2004-10-07 22:58:53 +02:00
|
|
|
/** Increase the reference count of <b>env</b>, and return it.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
crypto_pk_env_t *
|
|
|
|
crypto_pk_dup_key(crypto_pk_env_t *env)
|
|
|
|
{
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(env->key);
|
2002-09-24 12:43:57 +02:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
env->refs++;
|
2002-09-24 12:43:57 +02:00
|
|
|
return env;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Encrypt <b>fromlen</b> bytes from <b>from</b> with the public key
|
|
|
|
* in <b>env</b>, using the padding method <b>padding</b>. On success,
|
|
|
|
* write the result to <b>to</b>, and return the number of bytes
|
|
|
|
* written. On failure, return -1.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2004-11-02 03:28:51 +01:00
|
|
|
int
|
2005-05-07 07:55:06 +02:00
|
|
|
crypto_pk_public_encrypt(crypto_pk_env_t *env, char *to,
|
|
|
|
const char *from, size_t fromlen, int padding)
|
2002-07-25 10:17:22 +02:00
|
|
|
{
|
2004-04-26 20:09:50 +02:00
|
|
|
int r;
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(from);
|
|
|
|
tor_assert(to);
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2005-05-07 07:55:06 +02:00
|
|
|
r = RSA_public_encrypt(fromlen, (unsigned char*)from, (unsigned char*)to,
|
|
|
|
env->key, crypto_get_rsa_padding(padding));
|
2004-05-01 23:41:23 +02:00
|
|
|
if (r<0) {
|
2004-04-26 20:09:50 +02:00
|
|
|
crypto_log_errors(LOG_WARN, "performing RSA encryption");
|
2004-05-01 23:41:23 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-04-26 20:09:50 +02:00
|
|
|
return r;
|
2002-07-25 10:17:22 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Decrypt <b>fromlen</b> bytes from <b>from</b> with the private key
|
|
|
|
* in <b>env</b>, using the padding method <b>padding</b>. On success,
|
|
|
|
* write the result to <b>to</b>, and return the number of bytes
|
|
|
|
* written. On failure, return -1.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2004-11-02 03:28:51 +01:00
|
|
|
int
|
2005-05-07 07:55:06 +02:00
|
|
|
crypto_pk_private_decrypt(crypto_pk_env_t *env, char *to,
|
|
|
|
const char *from, size_t fromlen,
|
2004-11-02 03:28:51 +01:00
|
|
|
int padding, int warnOnFailure)
|
2002-07-25 10:17:22 +02:00
|
|
|
{
|
2004-04-26 20:09:50 +02:00
|
|
|
int r;
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(from);
|
|
|
|
tor_assert(to);
|
|
|
|
tor_assert(env->key);
|
2004-04-03 04:40:30 +02:00
|
|
|
if (!env->key->p)
|
|
|
|
/* Not a private key */
|
|
|
|
return -1;
|
2003-04-16 17:24:09 +02:00
|
|
|
|
2005-05-07 07:55:06 +02:00
|
|
|
r = RSA_private_decrypt(fromlen, (unsigned char*)from, (unsigned char*)to,
|
|
|
|
env->key, crypto_get_rsa_padding(padding));
|
|
|
|
|
2004-05-01 23:41:23 +02:00
|
|
|
if (r<0) {
|
2005-10-17 18:21:42 +02:00
|
|
|
crypto_log_errors(warnOnFailure?LOG_WARN:LOG_DEBUG,
|
2004-05-12 21:30:28 +02:00
|
|
|
"performing RSA decryption");
|
2004-05-01 23:41:23 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-04-26 20:09:50 +02:00
|
|
|
return r;
|
2002-07-25 10:17:22 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Check the signature in <b>from</b> (<b>fromlen</b> bytes long) with the
|
|
|
|
* public key in <b>env</b>, using PKCS1 padding. On success, write the
|
|
|
|
* signed data to <b>to</b>, and return the number of bytes written.
|
2004-05-02 01:29:20 +02:00
|
|
|
* On failure, return -1.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2004-11-02 03:28:51 +01:00
|
|
|
int
|
2005-05-07 07:55:06 +02:00
|
|
|
crypto_pk_public_checksig(crypto_pk_env_t *env, char *to,
|
|
|
|
const char *from, size_t fromlen)
|
2003-05-07 04:13:23 +02:00
|
|
|
{
|
2004-04-26 20:09:50 +02:00
|
|
|
int r;
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(from);
|
|
|
|
tor_assert(to);
|
2005-12-14 21:40:40 +01:00
|
|
|
r = RSA_public_decrypt(fromlen, (unsigned char*)from, (unsigned char*)to,
|
|
|
|
env->key, RSA_PKCS1_PADDING);
|
2004-04-26 20:09:50 +02:00
|
|
|
|
2004-05-02 01:29:20 +02:00
|
|
|
if (r<0) {
|
2004-04-26 20:09:50 +02:00
|
|
|
crypto_log_errors(LOG_WARN, "checking RSA signature");
|
2004-05-02 01:29:20 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-04-26 20:09:50 +02:00
|
|
|
return r;
|
2003-05-07 04:13:23 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Check a siglen-byte long signature at <b>sig</b> against
|
|
|
|
* <b>datalen</b> bytes of data at <b>data</b>, using the public key
|
|
|
|
* in <b>env</b>. Return 0 if <b>sig</b> is a correct signature for
|
|
|
|
* SHA1(data). Else return -1.
|
2004-04-02 00:10:33 +02:00
|
|
|
*/
|
2004-11-02 03:28:51 +01:00
|
|
|
int
|
2005-05-07 07:55:06 +02:00
|
|
|
crypto_pk_public_checksig_digest(crypto_pk_env_t *env, const char *data,
|
|
|
|
int datalen, const char *sig, int siglen)
|
2004-04-02 00:10:33 +02:00
|
|
|
{
|
2004-04-03 04:40:30 +02:00
|
|
|
char digest[DIGEST_LEN];
|
2007-05-02 23:37:53 +02:00
|
|
|
char *buf;
|
2004-04-02 00:10:33 +02:00
|
|
|
int r;
|
|
|
|
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(data);
|
|
|
|
tor_assert(sig);
|
2004-04-02 00:10:33 +02:00
|
|
|
|
2004-11-02 03:28:51 +01:00
|
|
|
if (crypto_digest(digest,data,datalen)<0) {
|
2006-09-30 00:33:40 +02:00
|
|
|
log_warn(LD_BUG, "couldn't compute digest");
|
2004-04-02 00:10:33 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2007-05-02 23:37:53 +02:00
|
|
|
buf = tor_malloc(crypto_pk_keysize(env)+1);
|
2004-11-02 03:28:51 +01:00
|
|
|
r = crypto_pk_public_checksig(env,buf,sig,siglen);
|
2004-04-03 04:40:30 +02:00
|
|
|
if (r != DIGEST_LEN) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO, "Invalid signature");
|
2007-05-02 23:37:53 +02:00
|
|
|
tor_free(buf);
|
2004-04-02 00:10:33 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-04-03 04:40:30 +02:00
|
|
|
if (memcmp(buf, digest, DIGEST_LEN)) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO, "Signature mismatched with digest.");
|
2007-05-02 23:37:53 +02:00
|
|
|
tor_free(buf);
|
2004-04-02 00:10:33 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2007-05-02 23:37:53 +02:00
|
|
|
tor_free(buf);
|
2004-04-02 00:10:33 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-11-02 03:28:51 +01:00
|
|
|
/** Sign <b>fromlen</b> bytes of data from <b>from</b> with the private key in
|
|
|
|
* <b>env</b>, using PKCS1 padding. On success, write the signature to
|
|
|
|
* <b>to</b>, and return the number of bytes written. On failure, return
|
|
|
|
* -1.
|
|
|
|
*/
|
|
|
|
int
|
2005-05-07 07:55:06 +02:00
|
|
|
crypto_pk_private_sign(crypto_pk_env_t *env, char *to,
|
|
|
|
const char *from, size_t fromlen)
|
2004-11-02 03:28:51 +01:00
|
|
|
{
|
|
|
|
int r;
|
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(from);
|
|
|
|
tor_assert(to);
|
|
|
|
if (!env->key->p)
|
|
|
|
/* Not a private key */
|
|
|
|
return -1;
|
|
|
|
|
2005-12-14 21:40:40 +01:00
|
|
|
r = RSA_private_encrypt(fromlen, (unsigned char*)from, (unsigned char*)to,
|
|
|
|
env->key, RSA_PKCS1_PADDING);
|
2004-11-02 03:28:51 +01:00
|
|
|
if (r<0) {
|
|
|
|
crypto_log_errors(LOG_WARN, "generating RSA signature");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Compute a SHA1 digest of <b>fromlen</b> bytes of data stored at
|
|
|
|
* <b>from</b>; sign the data with the private key in <b>env</b>, and
|
|
|
|
* store it in <b>to</b>. Return the number of bytes written on
|
|
|
|
* success, and -1 on failure.
|
2004-04-02 00:10:33 +02:00
|
|
|
*/
|
2004-11-02 03:28:51 +01:00
|
|
|
int
|
2005-05-07 07:55:06 +02:00
|
|
|
crypto_pk_private_sign_digest(crypto_pk_env_t *env, char *to,
|
|
|
|
const char *from, size_t fromlen)
|
2004-04-02 00:10:33 +02:00
|
|
|
{
|
2004-04-03 04:40:30 +02:00
|
|
|
char digest[DIGEST_LEN];
|
2004-11-02 03:28:51 +01:00
|
|
|
if (crypto_digest(digest,from,fromlen)<0)
|
2004-05-01 23:41:23 +02:00
|
|
|
return -1;
|
2004-11-02 03:28:51 +01:00
|
|
|
return crypto_pk_private_sign(env,to,digest,DIGEST_LEN);
|
2004-04-02 00:10:33 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Perform a hybrid (public/secret) encryption on <b>fromlen</b>
|
|
|
|
* bytes of data from <b>from</b>, with padding type 'padding',
|
|
|
|
* storing the results on <b>to</b>.
|
2004-04-01 05:08:35 +02:00
|
|
|
*
|
|
|
|
* If no padding is used, the public key must be at least as large as
|
2004-05-10 05:53:24 +02:00
|
|
|
* <b>from</b>.
|
2004-04-01 05:08:35 +02:00
|
|
|
*
|
|
|
|
* Returns the number of bytes written on success, -1 on failure.
|
|
|
|
*
|
|
|
|
* The encrypted data consists of:
|
2004-05-10 05:53:24 +02:00
|
|
|
* - The source data, padded and encrypted with the public key, if the
|
|
|
|
* padded source data is no longer than the public key, and <b>force</b>
|
|
|
|
* is false, OR
|
|
|
|
* - The beginning of the source data prefixed with a 16-byte symmetric key,
|
|
|
|
* padded and encrypted with the public key; followed by the rest of
|
|
|
|
* the source data encrypted in AES-CTR mode with the symmetric key.
|
2004-04-01 05:08:35 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_pk_public_hybrid_encrypt(crypto_pk_env_t *env,
|
|
|
|
char *to,
|
|
|
|
const char *from,
|
|
|
|
size_t fromlen,
|
|
|
|
int padding, int force)
|
2004-04-01 05:08:35 +02:00
|
|
|
{
|
2005-05-07 07:55:06 +02:00
|
|
|
int overhead, outlen, r, symlen;
|
|
|
|
size_t pkeylen;
|
2004-04-01 05:08:35 +02:00
|
|
|
crypto_cipher_env_t *cipher = NULL;
|
2007-05-02 23:37:53 +02:00
|
|
|
char *buf = NULL;
|
2004-04-01 05:08:35 +02:00
|
|
|
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(from);
|
|
|
|
tor_assert(to);
|
2004-04-01 05:08:35 +02:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
overhead = crypto_get_rsa_padding_overhead(crypto_get_rsa_padding(padding));
|
2004-04-01 05:08:35 +02:00
|
|
|
pkeylen = crypto_pk_keysize(env);
|
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
if (padding == PK_NO_PADDING && fromlen < pkeylen)
|
2004-04-01 05:08:35 +02:00
|
|
|
return -1;
|
|
|
|
|
2004-04-06 22:55:46 +02:00
|
|
|
if (!force && fromlen+overhead <= pkeylen) {
|
2004-04-01 05:08:35 +02:00
|
|
|
/* It all fits in a single encrypt. */
|
2004-11-02 03:28:51 +01:00
|
|
|
return crypto_pk_public_encrypt(env,to,from,fromlen,padding);
|
2004-04-01 05:08:35 +02:00
|
|
|
}
|
2004-04-03 04:40:30 +02:00
|
|
|
cipher = crypto_new_cipher_env();
|
2004-04-01 05:08:35 +02:00
|
|
|
if (!cipher) return -1;
|
|
|
|
if (crypto_cipher_generate_key(cipher)<0)
|
|
|
|
goto err;
|
2004-04-06 22:16:12 +02:00
|
|
|
/* You can't just run around RSA-encrypting any bitstream: if it's
|
|
|
|
* greater than the RSA key, then OpenSSL will happily encrypt, and
|
|
|
|
* later decrypt to the wrong value. So we set the first bit of
|
|
|
|
* 'cipher->key' to 0 if we aren't padding. This means that our
|
|
|
|
* symmetric key is really only 127 bits.
|
|
|
|
*/
|
2004-04-03 04:40:30 +02:00
|
|
|
if (padding == PK_NO_PADDING)
|
2004-04-01 05:08:35 +02:00
|
|
|
cipher->key[0] &= 0x7f;
|
|
|
|
if (crypto_cipher_encrypt_init_cipher(cipher)<0)
|
|
|
|
goto err;
|
2007-05-02 23:37:53 +02:00
|
|
|
buf = tor_malloc(pkeylen+1);
|
2004-04-03 04:40:30 +02:00
|
|
|
memcpy(buf, cipher->key, CIPHER_KEY_LEN);
|
|
|
|
memcpy(buf+CIPHER_KEY_LEN, from, pkeylen-overhead-CIPHER_KEY_LEN);
|
2004-04-01 05:08:35 +02:00
|
|
|
|
|
|
|
/* Length of symmetrically encrypted data. */
|
2004-04-03 04:40:30 +02:00
|
|
|
symlen = fromlen-(pkeylen-overhead-CIPHER_KEY_LEN);
|
2004-04-01 05:08:35 +02:00
|
|
|
|
2004-11-02 03:28:51 +01:00
|
|
|
outlen = crypto_pk_public_encrypt(env,to,buf,pkeylen-overhead,padding);
|
2005-05-07 07:55:06 +02:00
|
|
|
if (outlen!=(int)pkeylen) {
|
2004-04-01 05:08:35 +02:00
|
|
|
goto err;
|
|
|
|
}
|
2004-11-02 03:28:51 +01:00
|
|
|
r = crypto_cipher_encrypt(cipher, to+outlen,
|
|
|
|
from+pkeylen-overhead-CIPHER_KEY_LEN, symlen);
|
2004-04-01 05:08:35 +02:00
|
|
|
|
|
|
|
if (r<0) goto err;
|
2007-05-02 23:37:53 +02:00
|
|
|
memset(buf, 0, pkeylen);
|
|
|
|
tor_free(buf);
|
2004-04-01 05:08:35 +02:00
|
|
|
crypto_free_cipher_env(cipher);
|
|
|
|
return outlen + symlen;
|
|
|
|
err:
|
2007-05-02 23:37:53 +02:00
|
|
|
memset(buf, 0, pkeylen);
|
|
|
|
tor_free(buf);
|
2004-04-01 05:08:35 +02:00
|
|
|
if (cipher) crypto_free_cipher_env(cipher);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Invert crypto_pk_public_hybrid_encrypt. */
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_pk_private_hybrid_decrypt(crypto_pk_env_t *env,
|
|
|
|
char *to,
|
|
|
|
const char *from,
|
|
|
|
size_t fromlen,
|
|
|
|
int padding, int warnOnFailure)
|
2004-04-01 05:08:35 +02:00
|
|
|
{
|
2006-10-09 04:35:51 +02:00
|
|
|
int outlen, r;
|
2005-05-07 07:55:06 +02:00
|
|
|
size_t pkeylen;
|
2004-04-01 05:08:35 +02:00
|
|
|
crypto_cipher_env_t *cipher = NULL;
|
2007-05-02 23:37:53 +02:00
|
|
|
char *buf = NULL;
|
2004-04-01 05:08:35 +02:00
|
|
|
|
|
|
|
pkeylen = crypto_pk_keysize(env);
|
|
|
|
|
|
|
|
if (fromlen <= pkeylen) {
|
2005-12-14 21:40:40 +01:00
|
|
|
return crypto_pk_private_decrypt(env,to,from,fromlen,padding,
|
|
|
|
warnOnFailure);
|
2004-04-01 05:08:35 +02:00
|
|
|
}
|
2007-05-02 23:37:53 +02:00
|
|
|
buf = tor_malloc(pkeylen+1);
|
2005-12-14 21:40:40 +01:00
|
|
|
outlen = crypto_pk_private_decrypt(env,buf,from,pkeylen,padding,
|
|
|
|
warnOnFailure);
|
2004-04-01 05:08:35 +02:00
|
|
|
if (outlen<0) {
|
2005-10-18 23:58:19 +02:00
|
|
|
log_fn(warnOnFailure?LOG_WARN:LOG_DEBUG, LD_CRYPTO,
|
|
|
|
"Error decrypting public-key data");
|
2007-05-02 23:37:53 +02:00
|
|
|
goto err;
|
2004-04-01 05:08:35 +02:00
|
|
|
}
|
2004-04-03 04:40:30 +02:00
|
|
|
if (outlen < CIPHER_KEY_LEN) {
|
2005-10-18 23:58:19 +02:00
|
|
|
log_fn(warnOnFailure?LOG_WARN:LOG_INFO, LD_CRYPTO,
|
|
|
|
"No room for a symmetric key");
|
2007-05-02 23:37:53 +02:00
|
|
|
goto err;
|
2004-04-01 05:08:35 +02:00
|
|
|
}
|
2004-04-28 22:31:32 +02:00
|
|
|
cipher = crypto_create_init_cipher(buf, 0);
|
2004-04-01 05:08:35 +02:00
|
|
|
if (!cipher) {
|
2007-05-02 23:37:53 +02:00
|
|
|
goto err;
|
2004-04-01 05:08:35 +02:00
|
|
|
}
|
2004-04-03 04:40:30 +02:00
|
|
|
memcpy(to,buf+CIPHER_KEY_LEN,outlen-CIPHER_KEY_LEN);
|
|
|
|
outlen -= CIPHER_KEY_LEN;
|
2004-11-02 03:28:51 +01:00
|
|
|
r = crypto_cipher_decrypt(cipher, to+outlen, from+pkeylen, fromlen-pkeylen);
|
2004-04-01 05:08:35 +02:00
|
|
|
if (r<0)
|
|
|
|
goto err;
|
2007-05-02 23:37:53 +02:00
|
|
|
memset(buf,0,pkeylen);
|
|
|
|
tor_free(buf);
|
2004-04-01 05:08:35 +02:00
|
|
|
crypto_free_cipher_env(cipher);
|
|
|
|
return outlen + (fromlen-pkeylen);
|
|
|
|
err:
|
2007-05-02 23:37:53 +02:00
|
|
|
memset(buf,0,pkeylen);
|
|
|
|
tor_free(buf);
|
2004-04-01 05:08:35 +02:00
|
|
|
if (cipher) crypto_free_cipher_env(cipher);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** ASN.1-encode the public portion of <b>pk</b> into <b>dest</b>.
|
|
|
|
* Return -1 on error, or the number of characters used on success.
|
2004-03-08 01:11:37 +01:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_pk_asn1_encode(crypto_pk_env_t *pk, char *dest, int dest_len)
|
2004-03-30 21:47:32 +02:00
|
|
|
{
|
|
|
|
int len;
|
2004-04-05 19:10:48 +02:00
|
|
|
unsigned char *buf, *cp;
|
2004-04-03 04:40:30 +02:00
|
|
|
len = i2d_RSAPublicKey(pk->key, NULL);
|
2004-03-30 21:47:32 +02:00
|
|
|
if (len < 0 || len > dest_len)
|
|
|
|
return -1;
|
2004-04-05 19:10:48 +02:00
|
|
|
cp = buf = tor_malloc(len+1);
|
|
|
|
len = i2d_RSAPublicKey(pk->key, &cp);
|
2004-03-31 00:50:49 +02:00
|
|
|
if (len < 0) {
|
2004-04-26 20:09:50 +02:00
|
|
|
crypto_log_errors(LOG_WARN,"encoding public key");
|
2004-03-31 00:50:49 +02:00
|
|
|
tor_free(buf);
|
2004-03-30 21:47:32 +02:00
|
|
|
return -1;
|
2004-03-31 00:50:49 +02:00
|
|
|
}
|
|
|
|
/* We don't encode directly into 'dest', because that would be illegal
|
|
|
|
* type-punning. (C99 is smarter than me, C99 is smarter than me...)
|
|
|
|
*/
|
|
|
|
memcpy(dest,buf,len);
|
|
|
|
tor_free(buf);
|
2004-03-30 21:47:32 +02:00
|
|
|
return len;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Decode an ASN.1-encoded public key from <b>str</b>; return the result on
|
2004-05-02 01:29:20 +02:00
|
|
|
* success and NULL on failure.
|
2004-03-30 21:47:32 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
crypto_pk_env_t *
|
|
|
|
crypto_pk_asn1_decode(const char *str, size_t len)
|
2004-03-30 21:47:32 +02:00
|
|
|
{
|
|
|
|
RSA *rsa;
|
2004-04-01 00:41:25 +02:00
|
|
|
unsigned char *buf;
|
2004-03-31 00:42:26 +02:00
|
|
|
/* This ifdef suppresses a type warning. Take out the first case once
|
|
|
|
* everybody is using openssl 0.9.7 or later.
|
|
|
|
*/
|
|
|
|
#if OPENSSL_VERSION_NUMBER < 0x00907000l
|
2004-04-05 19:10:48 +02:00
|
|
|
unsigned char *cp;
|
2004-03-31 00:42:26 +02:00
|
|
|
#else
|
2004-04-05 19:10:48 +02:00
|
|
|
const unsigned char *cp;
|
2004-03-31 00:42:26 +02:00
|
|
|
#endif
|
2004-04-05 19:10:48 +02:00
|
|
|
cp = buf = tor_malloc(len);
|
|
|
|
memcpy(buf,str,len);
|
|
|
|
rsa = d2i_RSAPublicKey(NULL, &cp, len);
|
2004-03-31 00:50:49 +02:00
|
|
|
tor_free(buf);
|
2004-04-26 20:09:50 +02:00
|
|
|
if (!rsa) {
|
|
|
|
crypto_log_errors(LOG_WARN,"decoding public key");
|
|
|
|
return NULL;
|
|
|
|
}
|
2004-03-30 21:47:32 +02:00
|
|
|
return _crypto_new_pk_env_rsa(rsa);
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Given a private or public key <b>pk</b>, put a SHA1 hash of the
|
|
|
|
* public key into <b>digest_out</b> (must have DIGEST_LEN bytes of space).
|
2004-10-07 22:58:53 +02:00
|
|
|
* Return 0 on success, -1 on failure.
|
2004-03-30 21:47:32 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_pk_get_digest(crypto_pk_env_t *pk, char *digest_out)
|
2003-09-25 07:17:11 +02:00
|
|
|
{
|
|
|
|
unsigned char *buf, *bufp;
|
|
|
|
int len;
|
2004-04-03 04:40:30 +02:00
|
|
|
|
|
|
|
len = i2d_RSAPublicKey(pk->key, NULL);
|
2003-09-25 07:17:11 +02:00
|
|
|
if (len < 0)
|
|
|
|
return -1;
|
|
|
|
buf = bufp = tor_malloc(len+1);
|
2004-04-03 04:40:30 +02:00
|
|
|
len = i2d_RSAPublicKey(pk->key, &bufp);
|
2003-09-25 07:17:11 +02:00
|
|
|
if (len < 0) {
|
2004-04-26 20:09:50 +02:00
|
|
|
crypto_log_errors(LOG_WARN,"encoding public key");
|
2005-09-30 22:47:58 +02:00
|
|
|
tor_free(buf);
|
2003-09-25 07:17:11 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2005-05-07 07:55:06 +02:00
|
|
|
if (crypto_digest(digest_out, (char*)buf, len) < 0) {
|
2005-09-30 22:47:58 +02:00
|
|
|
tor_free(buf);
|
2003-09-25 07:17:11 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2005-09-30 22:47:58 +02:00
|
|
|
tor_free(buf);
|
2004-03-30 21:47:32 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Given a private or public key <b>pk</b>, put a fingerprint of the
|
|
|
|
* public key into <b>fp_out</b> (must have at least FINGERPRINT_LEN+1 bytes of
|
2004-10-07 22:58:53 +02:00
|
|
|
* space). Return 0 on success, -1 on failure.
|
2004-05-10 05:53:24 +02:00
|
|
|
*
|
|
|
|
* Fingerprints are computed as the SHA1 digest of the ASN.1 encoding
|
2004-07-01 03:16:59 +02:00
|
|
|
* of the public key, converted to hexadecimal, in upper case, with a
|
|
|
|
* space after every four digits.
|
2004-10-06 15:26:10 +02:00
|
|
|
*
|
|
|
|
* If <b>add_space</b> is false, omit the spaces.
|
2004-03-30 21:47:32 +02:00
|
|
|
*/
|
|
|
|
int
|
2004-10-06 15:26:10 +02:00
|
|
|
crypto_pk_get_fingerprint(crypto_pk_env_t *pk, char *fp_out, int add_space)
|
2004-03-30 21:47:32 +02:00
|
|
|
{
|
2005-05-07 07:55:06 +02:00
|
|
|
char digest[DIGEST_LEN];
|
|
|
|
char hexdigest[HEX_DIGEST_LEN+1];
|
2004-03-30 21:47:32 +02:00
|
|
|
if (crypto_pk_get_digest(pk, digest)) {
|
|
|
|
return -1;
|
|
|
|
}
|
2004-10-07 22:58:53 +02:00
|
|
|
base16_encode(hexdigest,sizeof(hexdigest),digest,DIGEST_LEN);
|
2004-10-06 15:26:10 +02:00
|
|
|
if (add_space) {
|
2007-02-05 19:33:52 +01:00
|
|
|
if (tor_strpartition(fp_out, FINGERPRINT_LEN+1, hexdigest, " ", 4)<0)
|
2004-10-07 23:37:06 +02:00
|
|
|
return -1;
|
2004-10-07 22:58:53 +02:00
|
|
|
} else {
|
2007-01-20 04:35:03 +01:00
|
|
|
strncpy(fp_out, hexdigest, HEX_DIGEST_LEN+1);
|
2004-10-06 15:26:10 +02:00
|
|
|
}
|
2003-09-25 07:17:11 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Return true iff <b>s</b> is in the correct format for a fingerprint.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
int
|
2003-09-26 22:41:23 +02:00
|
|
|
crypto_pk_check_fingerprint_syntax(const char *s)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < FINGERPRINT_LEN; ++i) {
|
|
|
|
if ((i%5) == 4) {
|
2004-12-08 08:20:21 +01:00
|
|
|
if (!TOR_ISSPACE(s[i])) return 0;
|
2003-09-26 22:41:23 +02:00
|
|
|
} else {
|
2004-12-08 08:20:21 +01:00
|
|
|
if (!TOR_ISXDIGIT(s[i])) return 0;
|
2003-09-26 22:41:23 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if (s[FINGERPRINT_LEN]) return 0;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2002-07-24 16:02:39 +02:00
|
|
|
/* symmetric crypto */
|
2004-05-01 23:41:23 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Generate a new random key for the symmetric cipher in <b>env</b>.
|
2004-05-01 23:41:23 +02:00
|
|
|
* Return 0 on success, -1 on failure. Does not initialize the cipher.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_cipher_generate_key(crypto_cipher_env_t *env)
|
2002-08-22 09:30:03 +02:00
|
|
|
{
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(env);
|
2003-03-19 21:41:15 +01:00
|
|
|
|
2004-11-02 03:28:51 +01:00
|
|
|
return crypto_rand(env->key, CIPHER_KEY_LEN);
|
2002-08-22 09:30:03 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Set the symmetric key for the cipher in <b>env</b> to the first
|
|
|
|
* CIPHER_KEY_LEN bytes of <b>key</b>. Does not initialize the cipher.
|
2004-10-07 22:58:53 +02:00
|
|
|
* Return 0 on success, -1 on failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_cipher_set_key(crypto_cipher_env_t *env, const char *key)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(key);
|
2003-03-19 21:41:15 +01:00
|
|
|
|
|
|
|
if (!env->key)
|
2002-07-25 10:17:22 +02:00
|
|
|
return -1;
|
2003-03-19 21:41:15 +01:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
memcpy(env->key, key, CIPHER_KEY_LEN);
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2002-07-24 16:02:39 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2002-07-25 10:17:22 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Return a pointer to the key set for the cipher in <b>env</b>.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
const char *
|
|
|
|
crypto_cipher_get_key(crypto_cipher_env_t *env)
|
2003-09-10 02:47:24 +02:00
|
|
|
{
|
|
|
|
return env->key;
|
|
|
|
}
|
|
|
|
|
2004-10-07 22:58:53 +02:00
|
|
|
/** Initialize the cipher in <b>env</b> for encryption. Return 0 on
|
|
|
|
* success, -1 on failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_cipher_encrypt_init_cipher(crypto_cipher_env_t *env)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(env);
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
aes_set_key(env->cipher, env->key, CIPHER_KEY_LEN*8);
|
|
|
|
return 0;
|
2002-07-24 16:02:39 +02:00
|
|
|
}
|
|
|
|
|
2004-10-07 22:58:53 +02:00
|
|
|
/** Initialize the cipher in <b>env</b> for decryption. Return 0 on
|
|
|
|
* success, -1 on failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_cipher_decrypt_init_cipher(crypto_cipher_env_t *env)
|
2002-07-25 10:17:22 +02:00
|
|
|
{
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(env);
|
2003-03-19 21:41:15 +01:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
aes_set_key(env->cipher, env->key, CIPHER_KEY_LEN*8);
|
|
|
|
return 0;
|
2002-07-25 10:17:22 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Encrypt <b>fromlen</b> bytes from <b>from</b> using the cipher
|
|
|
|
* <b>env</b>; on success, store the result to <b>to</b> and return 0.
|
|
|
|
* On failure, return -1.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2004-11-02 03:28:51 +01:00
|
|
|
int
|
2005-05-07 07:55:06 +02:00
|
|
|
crypto_cipher_encrypt(crypto_cipher_env_t *env, char *to,
|
|
|
|
const char *from, size_t fromlen)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(env->cipher);
|
|
|
|
tor_assert(from);
|
|
|
|
tor_assert(fromlen);
|
|
|
|
tor_assert(to);
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
aes_crypt(env->cipher, from, fromlen, to);
|
|
|
|
return 0;
|
2002-07-24 16:02:39 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Decrypt <b>fromlen</b> bytes from <b>from</b> using the cipher
|
|
|
|
* <b>env</b>; on success, store the result to <b>to</b> and return 0.
|
|
|
|
* On failure, return -1.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2004-11-02 03:28:51 +01:00
|
|
|
int
|
2005-05-07 07:55:06 +02:00
|
|
|
crypto_cipher_decrypt(crypto_cipher_env_t *env, char *to,
|
|
|
|
const char *from, size_t fromlen)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(from);
|
|
|
|
tor_assert(to);
|
2003-06-30 21:18:32 +02:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
aes_crypt(env->cipher, from, fromlen, to);
|
|
|
|
return 0;
|
2003-06-30 21:18:32 +02:00
|
|
|
}
|
|
|
|
|
2002-07-24 16:02:39 +02:00
|
|
|
/* SHA-1 */
|
2004-05-01 23:41:23 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Compute the SHA1 digest of <b>len</b> bytes in data stored in
|
|
|
|
* <b>m</b>. Write the DIGEST_LEN byte result into <b>digest</b>.
|
2004-12-01 04:48:14 +01:00
|
|
|
* Return 0 on success, -1 on failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_digest(char *digest, const char *m, size_t len)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(m);
|
|
|
|
tor_assert(digest);
|
2005-05-07 07:55:06 +02:00
|
|
|
return (SHA1((const unsigned char*)m,len,(unsigned char*)digest) == NULL);
|
2002-07-24 16:02:39 +02:00
|
|
|
}
|
|
|
|
|
2005-10-06 06:33:40 +02:00
|
|
|
/** Intermediate information about the digest of a stream of data. */
|
2003-12-16 06:29:04 +01:00
|
|
|
struct crypto_digest_env_t {
|
|
|
|
SHA_CTX d;
|
|
|
|
};
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Allocate and return a new digest object.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
crypto_digest_env_t *
|
2004-04-03 04:40:30 +02:00
|
|
|
crypto_new_digest_env(void)
|
2003-12-16 06:29:04 +01:00
|
|
|
{
|
2003-12-16 06:47:21 +01:00
|
|
|
crypto_digest_env_t *r;
|
|
|
|
r = tor_malloc(sizeof(crypto_digest_env_t));
|
2003-12-16 06:29:04 +01:00
|
|
|
SHA1_Init(&r->d);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Deallocate a digest object.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
void
|
2005-09-30 03:09:52 +02:00
|
|
|
crypto_free_digest_env(crypto_digest_env_t *digest)
|
|
|
|
{
|
2004-04-03 04:40:30 +02:00
|
|
|
tor_free(digest);
|
2003-12-16 06:29:04 +01:00
|
|
|
}
|
2003-12-16 06:47:21 +01:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Add <b>len</b> bytes from <b>data</b> to the digest object.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
void
|
|
|
|
crypto_digest_add_bytes(crypto_digest_env_t *digest, const char *data,
|
2003-12-16 06:47:21 +01:00
|
|
|
size_t len)
|
2003-12-16 06:29:04 +01:00
|
|
|
{
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(digest);
|
|
|
|
tor_assert(data);
|
2004-06-01 18:36:56 +02:00
|
|
|
/* Using the SHA1_*() calls directly means we don't support doing
|
|
|
|
* sha1 in hardware. But so far the delay of getting the question
|
|
|
|
* to the hardware, and hearing the answer, is likely higher than
|
|
|
|
* just doing it ourselves. Hashes are fast.
|
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
SHA1_Update(&digest->d, (void*)data, len);
|
|
|
|
}
|
2003-12-16 06:47:21 +01:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Compute the hash of the data that has been passed to the digest
|
|
|
|
* object; write the first out_len bytes of the result to <b>out</b>.
|
|
|
|
* <b>out_len</b> must be \<= DIGEST_LEN.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
crypto_digest_get_digest(crypto_digest_env_t *digest,
|
|
|
|
char *out, size_t out_len)
|
2003-12-16 06:29:04 +01:00
|
|
|
{
|
2005-05-07 07:55:06 +02:00
|
|
|
static unsigned char r[DIGEST_LEN];
|
2004-05-16 01:49:41 +02:00
|
|
|
SHA_CTX tmpctx;
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(digest);
|
|
|
|
tor_assert(out);
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(out_len <= DIGEST_LEN);
|
2004-05-16 01:49:41 +02:00
|
|
|
/* memcpy into a temporary ctx, since SHA1_Final clears the context */
|
|
|
|
memcpy(&tmpctx, &digest->d, sizeof(SHA_CTX));
|
|
|
|
SHA1_Final(r, &tmpctx);
|
2003-12-16 06:29:04 +01:00
|
|
|
memcpy(out, r, out_len);
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Allocate and return a new digest object with the same state as
|
|
|
|
* <b>digest</b>
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
crypto_digest_env_t *
|
2003-12-16 06:47:21 +01:00
|
|
|
crypto_digest_dup(const crypto_digest_env_t *digest)
|
2003-12-16 06:29:04 +01:00
|
|
|
{
|
|
|
|
crypto_digest_env_t *r;
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(digest);
|
2003-12-16 06:29:04 +01:00
|
|
|
r = tor_malloc(sizeof(crypto_digest_env_t));
|
|
|
|
memcpy(r,digest,sizeof(crypto_digest_env_t));
|
2003-12-16 06:47:21 +01:00
|
|
|
return r;
|
2003-12-16 06:29:04 +01:00
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Replace the state of the digest object <b>into</b> with the state
|
|
|
|
* of the digest object <b>from</b>.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
void
|
|
|
|
crypto_digest_assign(crypto_digest_env_t *into,
|
2003-12-16 06:47:21 +01:00
|
|
|
const crypto_digest_env_t *from)
|
2003-12-16 06:29:04 +01:00
|
|
|
{
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(into);
|
|
|
|
tor_assert(from);
|
2003-12-16 06:29:04 +01:00
|
|
|
memcpy(into,from,sizeof(crypto_digest_env_t));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* DH */
|
2004-05-01 23:41:23 +02:00
|
|
|
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Shared P parameter for our DH key exchanged. */
|
2003-05-01 02:53:46 +02:00
|
|
|
static BIGNUM *dh_param_p = NULL;
|
2004-05-10 12:27:54 +02:00
|
|
|
/** Shared G parameter for our DH key exchanges. */
|
2003-05-01 02:53:46 +02:00
|
|
|
static BIGNUM *dh_param_g = NULL;
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Initialize dh_param_p and dh_param_g if they are not already
|
2004-05-01 23:41:23 +02:00
|
|
|
* set. */
|
2005-09-30 03:09:52 +02:00
|
|
|
static void
|
|
|
|
init_dh_param(void)
|
|
|
|
{
|
2003-05-01 02:53:46 +02:00
|
|
|
BIGNUM *p, *g;
|
2005-08-07 22:36:14 +02:00
|
|
|
int r;
|
2003-05-01 02:53:46 +02:00
|
|
|
if (dh_param_p && dh_param_g)
|
|
|
|
return;
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2003-05-01 02:53:46 +02:00
|
|
|
p = BN_new();
|
|
|
|
g = BN_new();
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(p);
|
|
|
|
tor_assert(g);
|
2003-05-01 02:53:46 +02:00
|
|
|
|
2003-05-07 04:28:42 +02:00
|
|
|
/* This is from rfc2409, section 6.2. It's a safe prime, and
|
|
|
|
supposedly it equals:
|
|
|
|
2^1024 - 2^960 - 1 + 2^64 * { [2^894 pi] + 129093 }.
|
|
|
|
*/
|
|
|
|
r = BN_hex2bn(&p,
|
2003-12-16 09:13:26 +01:00
|
|
|
"FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08"
|
|
|
|
"8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B"
|
|
|
|
"302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9"
|
|
|
|
"A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6"
|
|
|
|
"49286651ECE65381FFFFFFFFFFFFFFFF");
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(r);
|
2003-05-01 02:53:46 +02:00
|
|
|
|
|
|
|
r = BN_set_word(g, 2);
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(r);
|
2003-05-01 02:53:46 +02:00
|
|
|
dh_param_p = p;
|
|
|
|
dh_param_g = g;
|
|
|
|
}
|
|
|
|
|
2005-11-14 20:18:31 +01:00
|
|
|
#define DH_PRIVATE_KEY_BITS 320
|
|
|
|
|
2004-10-12 21:09:40 +02:00
|
|
|
/** Allocate and return a new DH object for a key exchange.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
crypto_dh_env_t *
|
|
|
|
crypto_dh_new(void)
|
2003-05-01 02:53:46 +02:00
|
|
|
{
|
|
|
|
crypto_dh_env_t *res = NULL;
|
|
|
|
|
|
|
|
if (!dh_param_p)
|
|
|
|
init_dh_param();
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2004-10-16 22:38:57 +02:00
|
|
|
res = tor_malloc_zero(sizeof(crypto_dh_env_t));
|
2003-05-01 02:53:46 +02:00
|
|
|
|
|
|
|
if (!(res->dh = DH_new()))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (!(res->dh->p = BN_dup(dh_param_p)))
|
|
|
|
goto err;
|
|
|
|
|
|
|
|
if (!(res->dh->g = BN_dup(dh_param_g)))
|
|
|
|
goto err;
|
|
|
|
|
2005-11-14 20:18:31 +01:00
|
|
|
res->dh->length = DH_PRIVATE_KEY_BITS;
|
|
|
|
|
2003-05-01 02:53:46 +02:00
|
|
|
return res;
|
|
|
|
err:
|
2004-04-26 20:09:50 +02:00
|
|
|
crypto_log_errors(LOG_WARN, "creating DH object");
|
2003-05-01 02:53:46 +02:00
|
|
|
if (res && res->dh) DH_free(res->dh); /* frees p and g too */
|
2005-09-30 22:47:58 +02:00
|
|
|
if (res) tor_free(res);
|
2003-05-01 02:53:46 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
2004-05-01 23:41:23 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Return the length of the DH key in <b>dh</b>, in bytes.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_dh_get_bytes(crypto_dh_env_t *dh)
|
2003-05-01 02:53:46 +02:00
|
|
|
{
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(dh);
|
2003-05-01 02:53:46 +02:00
|
|
|
return DH_size(dh->dh);
|
|
|
|
}
|
2004-05-01 23:41:23 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Generate \<x,g^x\> for our part of the key exchange. Return 0 on
|
2004-05-01 23:41:23 +02:00
|
|
|
* success, -1 on failure.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_dh_generate_public(crypto_dh_env_t *dh)
|
2004-04-01 22:04:54 +02:00
|
|
|
{
|
2005-08-07 22:36:14 +02:00
|
|
|
again:
|
2004-04-26 20:09:50 +02:00
|
|
|
if (!DH_generate_key(dh->dh)) {
|
|
|
|
crypto_log_errors(LOG_WARN, "generating DH key");
|
2004-04-01 22:04:54 +02:00
|
|
|
return -1;
|
2004-04-26 20:09:50 +02:00
|
|
|
}
|
2005-08-07 22:36:14 +02:00
|
|
|
if (tor_check_dh_key(dh->dh->pub_key)<0) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO, "Weird! Our own DH key was invalid. I guess once-in-"
|
|
|
|
"the-universe chances really do happen. Trying again.");
|
2005-08-07 22:36:14 +02:00
|
|
|
/* Free and clear the keys, so openssl will actually try again. */
|
|
|
|
BN_free(dh->dh->pub_key);
|
|
|
|
BN_free(dh->dh->priv_key);
|
|
|
|
dh->dh->pub_key = dh->dh->priv_key = NULL;
|
|
|
|
goto again;
|
|
|
|
}
|
2004-04-01 22:04:54 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2004-05-01 23:41:23 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Generate g^x as necessary, and write the g^x for the key exchange
|
|
|
|
* as a <b>pubkey_len</b>-byte value into <b>pubkey</b>. Return 0 on
|
|
|
|
* success, -1 on failure. <b>pubkey_len</b> must be \>= DH_BYTES.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_dh_get_public(crypto_dh_env_t *dh, char *pubkey, size_t pubkey_len)
|
2003-05-01 02:53:46 +02:00
|
|
|
{
|
|
|
|
int bytes;
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(dh);
|
2004-04-01 22:04:54 +02:00
|
|
|
if (!dh->dh->pub_key) {
|
2004-04-26 20:09:50 +02:00
|
|
|
if (crypto_dh_generate_public(dh)<0)
|
2004-04-01 22:04:54 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(dh->dh->pub_key);
|
2003-05-01 02:53:46 +02:00
|
|
|
bytes = BN_num_bytes(dh->dh->pub_key);
|
2004-10-12 22:20:19 +02:00
|
|
|
tor_assert(bytes >= 0);
|
2005-10-17 18:21:42 +02:00
|
|
|
if (pubkey_len < (size_t)bytes) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO,
|
|
|
|
"Weird! pubkey_len (%d) was smaller than DH_BYTES (%d)",
|
|
|
|
(int) pubkey_len, bytes);
|
2003-05-01 02:53:46 +02:00
|
|
|
return -1;
|
2005-10-17 18:21:42 +02:00
|
|
|
}
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2003-05-01 02:53:46 +02:00
|
|
|
memset(pubkey, 0, pubkey_len);
|
2005-05-07 07:55:06 +02:00
|
|
|
BN_bn2bin(dh->dh->pub_key, (unsigned char*)(pubkey+(pubkey_len-bytes)));
|
2003-05-01 02:53:46 +02:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2003-07-30 21:10:20 +02:00
|
|
|
|
2005-08-07 22:36:14 +02:00
|
|
|
/** Check for bad diffie-hellman public keys (g^x). Return 0 if the key is
|
2005-12-07 00:09:44 +01:00
|
|
|
* okay (in the subgroup [2,p-2]), or -1 if it's bad.
|
2005-08-15 03:03:50 +02:00
|
|
|
* See http://www.cl.cam.ac.uk/ftp/users/rja14/psandqs.ps.gz for some tips.
|
2005-08-07 22:36:14 +02:00
|
|
|
*/
|
2005-08-05 01:14:42 +02:00
|
|
|
static int
|
2005-08-07 22:36:14 +02:00
|
|
|
tor_check_dh_key(BIGNUM *bn)
|
2005-08-05 01:14:42 +02:00
|
|
|
{
|
2005-12-07 00:09:44 +01:00
|
|
|
BIGNUM *x;
|
2005-08-07 22:36:14 +02:00
|
|
|
char *s;
|
2005-08-05 01:14:42 +02:00
|
|
|
tor_assert(bn);
|
2005-08-07 22:36:14 +02:00
|
|
|
x = BN_new();
|
2005-12-07 00:09:44 +01:00
|
|
|
tor_assert(x);
|
2005-08-05 01:14:42 +02:00
|
|
|
if (!dh_param_p)
|
|
|
|
init_dh_param();
|
2005-12-07 00:09:44 +01:00
|
|
|
BN_set_word(x, 1);
|
2005-08-07 22:36:14 +02:00
|
|
|
if (BN_cmp(bn,x)<=0) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO, "DH key must be at least 2.");
|
2005-08-07 22:36:14 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
BN_copy(x,dh_param_p);
|
2005-12-07 00:09:44 +01:00
|
|
|
BN_sub_word(x, 1);
|
2005-08-07 22:36:14 +02:00
|
|
|
if (BN_cmp(bn,x)>=0) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO, "DH key must be at most p-2.");
|
2005-08-07 22:36:14 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
BN_free(x);
|
2005-08-05 01:14:42 +02:00
|
|
|
return 0;
|
2005-08-07 22:36:14 +02:00
|
|
|
err:
|
|
|
|
BN_free(x);
|
|
|
|
s = BN_bn2hex(bn);
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO, "Rejecting insecure DH key [%s]", s);
|
2005-08-07 22:36:14 +02:00
|
|
|
OPENSSL_free(s);
|
|
|
|
return -1;
|
2005-08-05 01:14:42 +02:00
|
|
|
}
|
|
|
|
|
2003-07-30 21:10:20 +02:00
|
|
|
#undef MIN
|
|
|
|
#define MIN(a,b) ((a)<(b)?(a):(b))
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Given a DH key exchange object, and our peer's value of g^y (as a
|
2004-10-07 22:58:53 +02:00
|
|
|
* <b>pubkey_len</b>-byte value in <b>pubkey</b>) generate
|
2004-05-10 05:53:24 +02:00
|
|
|
* <b>secret_bytes_out</b> bytes of shared key material and write them
|
2004-11-02 03:28:51 +01:00
|
|
|
* to <b>secret_out</b>. Return the number of bytes generated on success,
|
2004-10-07 22:58:53 +02:00
|
|
|
* or -1 on failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*
|
|
|
|
* (We generate key material by computing
|
2004-05-02 01:29:20 +02:00
|
|
|
* SHA1( g^xy || "\x00" ) || SHA1( g^xy || "\x01" ) || ...
|
2004-05-01 23:41:23 +02:00
|
|
|
* where || is concatenation.)
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_dh_compute_secret(crypto_dh_env_t *dh,
|
|
|
|
const char *pubkey, size_t pubkey_len,
|
|
|
|
char *secret_out, size_t secret_bytes_out)
|
2003-05-01 02:53:46 +02:00
|
|
|
{
|
2005-05-07 07:55:06 +02:00
|
|
|
char *secret_tmp = NULL;
|
2003-07-30 21:10:20 +02:00
|
|
|
BIGNUM *pubkey_bn = NULL;
|
2004-10-12 22:20:19 +02:00
|
|
|
size_t secret_len=0;
|
|
|
|
int result=0;
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(dh);
|
|
|
|
tor_assert(secret_bytes_out/DIGEST_LEN <= 255);
|
2003-07-30 21:10:20 +02:00
|
|
|
|
2005-05-07 07:55:06 +02:00
|
|
|
if (!(pubkey_bn = BN_bin2bn((const unsigned char*)pubkey, pubkey_len, NULL)))
|
2003-07-30 21:10:20 +02:00
|
|
|
goto error;
|
2005-08-07 22:36:14 +02:00
|
|
|
if (tor_check_dh_key(pubkey_bn)<0) {
|
2005-08-05 01:14:42 +02:00
|
|
|
/* Check for invalid public keys. */
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO,"Rejected invalid g^x");
|
2005-08-05 01:14:42 +02:00
|
|
|
goto error;
|
|
|
|
}
|
2005-12-08 18:38:32 +01:00
|
|
|
secret_tmp = tor_malloc(crypto_dh_get_bytes(dh));
|
2005-05-07 07:55:06 +02:00
|
|
|
result = DH_compute_key((unsigned char*)secret_tmp, pubkey_bn, dh->dh);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (result < 0) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO,"DH_compute_key() failed.");
|
2004-10-12 22:20:19 +02:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
secret_len = result;
|
2003-12-17 06:31:52 +01:00
|
|
|
/* sometimes secret_len might be less than 128, e.g., 127. that's ok. */
|
2005-08-06 18:50:51 +02:00
|
|
|
/* Actually, http://www.faqs.org/rfcs/rfc2631.html says:
|
|
|
|
* Leading zeros MUST be preserved, so that ZZ occupies as many
|
|
|
|
* octets as p. For instance, if p is 1024 bits, ZZ should be 128
|
|
|
|
* bytes long.
|
|
|
|
* What are the security implications here?
|
|
|
|
*/
|
2005-12-08 18:38:32 +01:00
|
|
|
if (crypto_expand_key_material(secret_tmp, secret_len,
|
|
|
|
secret_out, secret_bytes_out)<0)
|
|
|
|
goto error;
|
2003-07-30 21:10:20 +02:00
|
|
|
secret_len = secret_bytes_out;
|
2003-05-01 02:53:46 +02:00
|
|
|
|
2003-07-30 21:10:20 +02:00
|
|
|
goto done;
|
|
|
|
error:
|
2004-10-12 22:20:19 +02:00
|
|
|
result = -1;
|
2003-07-30 21:10:20 +02:00
|
|
|
done:
|
2004-04-26 20:09:50 +02:00
|
|
|
crypto_log_errors(LOG_WARN, "completing DH handshake");
|
2003-07-30 21:10:20 +02:00
|
|
|
if (pubkey_bn)
|
|
|
|
BN_free(pubkey_bn);
|
2003-12-17 06:31:52 +01:00
|
|
|
tor_free(secret_tmp);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (result < 0)
|
2004-10-12 22:20:19 +02:00
|
|
|
return result;
|
|
|
|
else
|
|
|
|
return secret_len;
|
2003-05-01 02:53:46 +02:00
|
|
|
}
|
2004-10-12 22:20:19 +02:00
|
|
|
|
2005-12-08 18:38:32 +01:00
|
|
|
/** Given <b>key_in_len</b> bytes of negotiated randomness in <b>key_in</b>
|
|
|
|
* ("K"), expand it into <b>key_out_len</b> bytes of negotiated key material in
|
|
|
|
* <b>key_out</b> by taking the first key_out_len bytes of
|
|
|
|
* H(K | [00]) | H(K | [01]) | ....
|
|
|
|
*
|
|
|
|
* Return 0 on success, -1 on failure.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
crypto_expand_key_material(const char *key_in, size_t key_in_len,
|
|
|
|
char *key_out, size_t key_out_len)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
char *cp, *tmp = tor_malloc(key_in_len+1);
|
|
|
|
char digest[DIGEST_LEN];
|
|
|
|
|
|
|
|
/* If we try to get more than this amount of key data, we'll repeat blocks.*/
|
|
|
|
tor_assert(key_out_len <= DIGEST_LEN*256);
|
|
|
|
|
|
|
|
memcpy(tmp, key_in, key_in_len);
|
2007-06-06 15:02:22 +02:00
|
|
|
for (cp = key_out, i=0; cp < key_out+key_out_len;
|
|
|
|
++i, cp += DIGEST_LEN) {
|
2005-12-08 18:38:32 +01:00
|
|
|
tmp[key_in_len] = i;
|
|
|
|
if (crypto_digest(digest, tmp, key_in_len+1))
|
|
|
|
goto err;
|
2007-06-06 15:02:22 +02:00
|
|
|
memcpy(cp, digest, MIN(DIGEST_LEN, key_out_len-(cp-key_out)));
|
2005-12-08 18:38:32 +01:00
|
|
|
}
|
|
|
|
memset(tmp, 0, key_in_len+1);
|
|
|
|
tor_free(tmp);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
err:
|
|
|
|
memset(tmp, 0, key_in_len+1);
|
|
|
|
tor_free(tmp);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Free a DH key exchange object.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void
|
|
|
|
crypto_dh_free(crypto_dh_env_t *dh)
|
2003-05-01 02:53:46 +02:00
|
|
|
{
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(dh);
|
|
|
|
tor_assert(dh->dh);
|
2003-05-01 02:53:46 +02:00
|
|
|
DH_free(dh->dh);
|
2005-09-30 22:47:58 +02:00
|
|
|
tor_free(dh);
|
2003-05-01 02:53:46 +02:00
|
|
|
}
|
|
|
|
|
2002-07-24 16:02:39 +02:00
|
|
|
/* random numbers */
|
2004-05-01 23:41:23 +02:00
|
|
|
|
2005-10-07 21:03:09 +02:00
|
|
|
/* This is how much entropy OpenSSL likes to add right now, so maybe it will
|
|
|
|
* work for us too. */
|
|
|
|
#define ADD_ENTROPY 32
|
|
|
|
|
|
|
|
/* Use RAND_poll if openssl is 0.9.6 release or later. (The "f" means
|
|
|
|
"release".) */
|
2006-03-26 08:47:51 +02:00
|
|
|
//#define USE_RAND_POLL (OPENSSL_VERSION_NUMBER >= 0x0090600fl)
|
2006-01-10 22:12:06 +01:00
|
|
|
#define USE_RAND_POLL 0
|
2006-03-26 08:47:51 +02:00
|
|
|
/* XXX Somehow setting USE_RAND_POLL on causes stack smashes. We're
|
|
|
|
* not sure where. This was the big bug with Tor 0.1.1.9-alpha. */
|
2005-10-07 21:03:09 +02:00
|
|
|
|
2005-10-07 00:22:22 +02:00
|
|
|
/** Seed OpenSSL's random number generator with bytes from the
|
2004-12-01 04:48:14 +01:00
|
|
|
* operating system. Return 0 on success, -1 on failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_seed_rng(void)
|
2004-03-11 06:14:06 +01:00
|
|
|
{
|
2005-10-07 21:03:09 +02:00
|
|
|
char buf[ADD_ENTROPY];
|
|
|
|
int rand_poll_status;
|
|
|
|
|
|
|
|
/* local variables */
|
2004-05-01 23:41:23 +02:00
|
|
|
#ifdef MS_WINDOWS
|
2004-03-11 06:14:06 +01:00
|
|
|
static int provider_set = 0;
|
2004-03-11 07:19:08 +01:00
|
|
|
static HCRYPTPROV provider;
|
2005-10-07 21:03:09 +02:00
|
|
|
#else
|
|
|
|
static const char *filenames[] = {
|
|
|
|
"/dev/srandom", "/dev/urandom", "/dev/random", NULL
|
|
|
|
};
|
|
|
|
int fd;
|
|
|
|
int i, n;
|
|
|
|
#endif
|
2004-03-11 06:14:06 +01:00
|
|
|
|
2005-10-07 21:03:09 +02:00
|
|
|
#if USE_RAND_POLL
|
|
|
|
/* OpenSSL 0.9.6 adds a RAND_poll function that knows about more kinds of
|
|
|
|
* entropy than we do. We'll try calling that, *and* calling our own entropy
|
|
|
|
* functions. If one succeeds, we'll accept the RNG as seeded. */
|
|
|
|
rand_poll_status = RAND_poll();
|
|
|
|
if (rand_poll_status == 0)
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO, "RAND_poll() failed.");
|
2005-10-07 21:03:09 +02:00
|
|
|
#else
|
|
|
|
rand_poll_status = 0;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef MS_WINDOWS
|
2004-03-11 06:14:06 +01:00
|
|
|
if (!provider_set) {
|
2005-12-14 21:40:40 +01:00
|
|
|
if (!CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL,
|
|
|
|
CRYPT_VERIFYCONTEXT)) {
|
2007-02-28 21:24:27 +01:00
|
|
|
if ((unsigned long)GetLastError() != (unsigned long)NTE_BAD_KEYSET) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO, "Can't get CryptoAPI provider [1]");
|
2005-10-07 21:03:09 +02:00
|
|
|
return rand_poll_status ? 0 : -1;
|
2004-03-11 06:14:06 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
provider_set = 1;
|
|
|
|
}
|
2005-06-06 22:02:09 +02:00
|
|
|
if (!CryptGenRandom(provider, sizeof(buf), buf)) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO, "Can't get entropy from CryptoAPI.");
|
2005-10-07 21:03:09 +02:00
|
|
|
return rand_poll_status ? 0 : -1;
|
2004-03-11 06:14:06 +01:00
|
|
|
}
|
2005-06-06 22:02:09 +02:00
|
|
|
RAND_seed(buf, sizeof(buf));
|
2004-03-11 06:14:06 +01:00
|
|
|
return 0;
|
|
|
|
#else
|
2003-06-13 23:13:37 +02:00
|
|
|
for (i = 0; filenames[i]; ++i) {
|
2004-04-26 20:09:50 +02:00
|
|
|
fd = open(filenames[i], O_RDONLY, 0);
|
|
|
|
if (fd<0) continue;
|
2006-02-13 09:01:59 +01:00
|
|
|
log_info(LD_CRYPTO, "Seeding RNG from \"%s\"", filenames[i]);
|
2005-06-06 22:02:09 +02:00
|
|
|
n = read_all(fd, buf, sizeof(buf), 0);
|
2004-04-26 20:09:50 +02:00
|
|
|
close(fd);
|
2005-06-06 22:02:09 +02:00
|
|
|
if (n != sizeof(buf)) {
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO,
|
|
|
|
"Error reading from entropy source (read only %d bytes).", n);
|
2003-06-13 23:13:37 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2005-06-06 22:02:09 +02:00
|
|
|
RAND_seed(buf, sizeof(buf));
|
2003-06-13 23:13:37 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-02-13 09:01:59 +01:00
|
|
|
log_warn(LD_CRYPTO, "Cannot seed RNG -- no entropy source found.");
|
2005-10-07 21:03:09 +02:00
|
|
|
return rand_poll_status ? 0 : -1;
|
2004-03-11 06:14:06 +01:00
|
|
|
#endif
|
2004-05-01 23:41:23 +02:00
|
|
|
}
|
2003-06-13 23:13:37 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Write n bytes of strong random data to <b>to</b>. Return 0 on
|
|
|
|
* success, -1 on failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
|
|
|
crypto_rand(char *to, size_t n)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2004-04-26 20:09:50 +02:00
|
|
|
int r;
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(to);
|
2005-05-07 07:55:06 +02:00
|
|
|
r = RAND_bytes((unsigned char*)to, n);
|
2004-04-26 20:09:50 +02:00
|
|
|
if (r == 0)
|
|
|
|
crypto_log_errors(LOG_WARN, "generating random data");
|
2004-05-01 23:41:23 +02:00
|
|
|
return (r == 1) ? 0 : -1;
|
2002-07-24 16:02:39 +02:00
|
|
|
}
|
2002-07-25 10:17:22 +02:00
|
|
|
|
2004-12-01 04:48:14 +01:00
|
|
|
/** Return a pseudorandom integer, chosen uniformly from the values
|
2004-05-10 12:27:54 +02:00
|
|
|
* between 0 and max-1. */
|
2005-09-30 03:09:52 +02:00
|
|
|
int
|
2005-10-07 00:18:01 +02:00
|
|
|
crypto_rand_int(unsigned int max)
|
2005-09-30 03:09:52 +02:00
|
|
|
{
|
2003-11-12 05:12:35 +01:00
|
|
|
unsigned int val;
|
2003-11-12 05:28:30 +01:00
|
|
|
unsigned int cutoff;
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(max < UINT_MAX);
|
|
|
|
tor_assert(max > 0); /* don't div by 0 */
|
2003-11-12 05:28:30 +01:00
|
|
|
|
|
|
|
/* We ignore any values that are >= 'cutoff,' to avoid biasing the
|
|
|
|
* distribution with clipping at the upper end of unsigned int's
|
|
|
|
* range.
|
|
|
|
*/
|
|
|
|
cutoff = UINT_MAX - (UINT_MAX%max);
|
2004-11-28 10:05:49 +01:00
|
|
|
while (1) {
|
2005-10-07 00:18:01 +02:00
|
|
|
crypto_rand((char*)&val, sizeof(val));
|
2006-10-01 23:59:05 +02:00
|
|
|
if (val < cutoff)
|
|
|
|
return val % max;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Return a pseudorandom integer, chosen uniformly from the values
|
|
|
|
* between 0 and max-1. */
|
|
|
|
uint64_t
|
|
|
|
crypto_rand_uint64(uint64_t max)
|
|
|
|
{
|
|
|
|
uint64_t val;
|
|
|
|
uint64_t cutoff;
|
|
|
|
tor_assert(max < UINT64_MAX);
|
|
|
|
tor_assert(max > 0); /* don't div by 0 */
|
|
|
|
|
|
|
|
/* We ignore any values that are >= 'cutoff,' to avoid biasing the
|
|
|
|
* distribution with clipping at the upper end of unsigned int's
|
|
|
|
* range.
|
|
|
|
*/
|
|
|
|
cutoff = UINT64_MAX - (UINT64_MAX%max);
|
|
|
|
while (1) {
|
|
|
|
crypto_rand((char*)&val, sizeof(val));
|
2003-11-12 05:28:30 +01:00
|
|
|
if (val < cutoff)
|
|
|
|
return val % max;
|
|
|
|
}
|
2002-07-25 10:17:22 +02:00
|
|
|
}
|
|
|
|
|
2004-10-30 21:26:31 +02:00
|
|
|
/** Return a randomly chosen element of sl; or NULL if sl is empty.
|
|
|
|
*/
|
2005-09-30 03:09:52 +02:00
|
|
|
void *
|
|
|
|
smartlist_choose(const smartlist_t *sl)
|
|
|
|
{
|
2004-10-30 21:26:31 +02:00
|
|
|
size_t len;
|
|
|
|
len = smartlist_len(sl);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (len)
|
2005-10-07 00:18:01 +02:00
|
|
|
return smartlist_get(sl,crypto_rand_int(len));
|
2004-10-30 21:26:31 +02:00
|
|
|
return NULL; /* no elements to choose from */
|
|
|
|
}
|
|
|
|
|
2007-05-18 23:19:14 +02:00
|
|
|
/** Scramble the elements of sl into a random order. */
|
|
|
|
void
|
|
|
|
smartlist_shuffle(smartlist_t *sl)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
/* From the end of the list to the front, choose at random from the
|
|
|
|
positions we haven't looked at yet, and swap that position into the
|
|
|
|
current position. Remember to give "no swap" the same probability as
|
|
|
|
any other swap. */
|
|
|
|
for (i = smartlist_len(sl)-1; i > 0; --i) {
|
|
|
|
int j = crypto_rand_int(i+1);
|
|
|
|
smartlist_swap(sl, i, j);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Base-64 encode <b>srclen</b> bytes of data from <b>src</b>. Write
|
|
|
|
* the result into <b>dest</b>, if it will fit within <b>destlen</b>
|
|
|
|
* bytes. Return the number of bytes written on success; -1 if
|
|
|
|
* destlen is too short, or other failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
int
|
2004-10-12 22:20:19 +02:00
|
|
|
base64_encode(char *dest, size_t destlen, const char *src, size_t srclen)
|
2003-05-07 04:13:23 +02:00
|
|
|
{
|
|
|
|
EVP_ENCODE_CTX ctx;
|
|
|
|
int len, ret;
|
2003-12-16 06:29:04 +01:00
|
|
|
|
|
|
|
/* 48 bytes of input -> 64 bytes of output plus newline.
|
2003-05-07 04:13:23 +02:00
|
|
|
Plus one more byte, in case I'm wrong.
|
|
|
|
*/
|
|
|
|
if (destlen < ((srclen/48)+1)*66)
|
|
|
|
return -1;
|
2004-12-02 05:33:01 +01:00
|
|
|
if (destlen > SIZE_T_CEILING)
|
|
|
|
return -1;
|
2003-05-07 04:13:23 +02:00
|
|
|
|
|
|
|
EVP_EncodeInit(&ctx);
|
2005-12-14 21:40:40 +01:00
|
|
|
EVP_EncodeUpdate(&ctx, (unsigned char*)dest, &len,
|
|
|
|
(unsigned char*)src, srclen);
|
2005-05-07 07:55:06 +02:00
|
|
|
EVP_EncodeFinal(&ctx, (unsigned char*)(dest+len), &ret);
|
2003-05-07 04:13:23 +02:00
|
|
|
ret += len;
|
|
|
|
return ret;
|
|
|
|
}
|
2004-05-01 23:41:23 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Base-64 decode <b>srclen</b> bytes of data from <b>src</b>. Write
|
|
|
|
* the result into <b>dest</b>, if it will fit within <b>destlen</b>
|
|
|
|
* bytes. Return the number of bytes written on success; -1 if
|
|
|
|
* destlen is too short, or other failure.
|
2004-12-13 19:38:19 +01:00
|
|
|
*
|
|
|
|
* NOTE: destlen should be a little longer than the amount of data it
|
|
|
|
* will contain, since we check for sufficient space conservatively.
|
|
|
|
* Here, "a little" is around 64-ish bytes.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
int
|
2004-10-12 22:20:19 +02:00
|
|
|
base64_decode(char *dest, size_t destlen, const char *src, size_t srclen)
|
2003-05-07 04:13:23 +02:00
|
|
|
{
|
|
|
|
EVP_ENCODE_CTX ctx;
|
|
|
|
int len, ret;
|
|
|
|
/* 64 bytes of input -> *up to* 48 bytes of output.
|
2004-10-13 07:54:58 +02:00
|
|
|
Plus one more byte, in case I'm wrong.
|
2003-05-07 04:13:23 +02:00
|
|
|
*/
|
|
|
|
if (destlen < ((srclen/64)+1)*49)
|
|
|
|
return -1;
|
2004-12-02 05:33:01 +01:00
|
|
|
if (destlen > SIZE_T_CEILING)
|
|
|
|
return -1;
|
2003-05-07 04:13:23 +02:00
|
|
|
|
|
|
|
EVP_DecodeInit(&ctx);
|
2005-12-14 21:40:40 +01:00
|
|
|
EVP_DecodeUpdate(&ctx, (unsigned char*)dest, &len,
|
|
|
|
(unsigned char*)src, srclen);
|
2005-05-07 07:55:06 +02:00
|
|
|
EVP_DecodeFinal(&ctx, (unsigned char*)dest, &ret);
|
2003-05-07 04:13:23 +02:00
|
|
|
ret += len;
|
|
|
|
return ret;
|
|
|
|
}
|
2004-03-30 21:47:32 +02:00
|
|
|
|
2006-09-29 20:13:37 +02:00
|
|
|
/** Base-64 encode DIGEST_LINE bytes from <b>digest</b>, remove the trailing =
|
|
|
|
* and newline characters, and store the nul-terminated result in the first
|
|
|
|
* BASE64_DIGEST_LEN+1 bytes of <b>d64</b>. */
|
2005-09-18 04:18:59 +02:00
|
|
|
int
|
|
|
|
digest_to_base64(char *d64, const char *digest)
|
|
|
|
{
|
|
|
|
char buf[256];
|
|
|
|
base64_encode(buf, sizeof(buf), digest, DIGEST_LEN);
|
|
|
|
buf[BASE64_DIGEST_LEN] = '\0';
|
|
|
|
memcpy(d64, buf, BASE64_DIGEST_LEN+1);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-09-29 20:13:37 +02:00
|
|
|
/** Given a base-64 encoded, nul-terminated digest in <b>d64</b> (without
|
|
|
|
* trailing newline or = characters), decode it and store the result in the
|
|
|
|
* first DIGEST_LEN bytes at <b>digest</b>. */
|
2005-09-18 04:18:59 +02:00
|
|
|
int
|
|
|
|
digest_from_base64(char *digest, const char *d64)
|
|
|
|
{
|
|
|
|
char buf_in[BASE64_DIGEST_LEN+3];
|
|
|
|
char buf[256];
|
|
|
|
if (strlen(d64) != BASE64_DIGEST_LEN)
|
|
|
|
return -1;
|
|
|
|
memcpy(buf_in, d64, BASE64_DIGEST_LEN);
|
|
|
|
memcpy(buf_in+BASE64_DIGEST_LEN, "=\n\0", 3);
|
|
|
|
if (base64_decode(buf, sizeof(buf), buf_in, strlen(buf_in)) != DIGEST_LEN)
|
|
|
|
return -1;
|
|
|
|
memcpy(digest, buf, DIGEST_LEN);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Implements base32 encoding as in rfc3548. Limitation: Requires
|
2004-07-22 10:30:06 +02:00
|
|
|
* that srclen*8 is a multiple of 5.
|
2004-04-08 22:56:33 +02:00
|
|
|
*/
|
2004-07-22 10:30:06 +02:00
|
|
|
void
|
2004-10-12 22:20:19 +02:00
|
|
|
base32_encode(char *dest, size_t destlen, const char *src, size_t srclen)
|
2004-03-30 21:47:32 +02:00
|
|
|
{
|
2004-10-12 22:20:19 +02:00
|
|
|
unsigned int nbits, i, bit, v, u;
|
2004-03-30 21:47:32 +02:00
|
|
|
nbits = srclen * 8;
|
|
|
|
|
2004-07-22 10:30:06 +02:00
|
|
|
tor_assert((nbits%5) == 0); /* We need an even multiple of 5 bits. */
|
|
|
|
tor_assert((nbits/5)+1 <= destlen); /* We need enough space. */
|
2004-12-02 05:33:01 +01:00
|
|
|
tor_assert(destlen < SIZE_T_CEILING);
|
2004-03-30 21:47:32 +02:00
|
|
|
|
|
|
|
for (i=0,bit=0; bit < nbits; ++i, bit+=5) {
|
|
|
|
/* set v to the 16-bit value starting at src[bits/8], 0-padded. */
|
2004-04-08 22:56:33 +02:00
|
|
|
v = ((uint8_t)src[bit/8]) << 8;
|
|
|
|
if (bit+5<nbits) v += (uint8_t)src[(bit/8)+1];
|
2004-03-30 21:47:32 +02:00
|
|
|
/* set u to the 5-bit value at the bit'th bit of src. */
|
|
|
|
u = (v >> (11-(bit%8))) & 0x1F;
|
|
|
|
dest[i] = BASE32_CHARS[u];
|
|
|
|
}
|
|
|
|
dest[i] = '\0';
|
|
|
|
}
|
2004-04-03 04:40:30 +02:00
|
|
|
|
2004-11-03 20:49:03 +01:00
|
|
|
/** Implement RFC2440-style iterated-salted S2K conversion: convert the
|
|
|
|
* <b>secret_len</b>-byte <b>secret</b> into a <b>key_out_len</b> byte
|
|
|
|
* <b>key_out</b>. As in RFC2440, the first 8 bytes of s2k_specifier
|
|
|
|
* are a salt; the 9th byte describes how much iteration to do.
|
|
|
|
* Does not support <b>key_out_len</b> > DIGEST_LEN.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
secret_to_key(char *key_out, size_t key_out_len, const char *secret,
|
|
|
|
size_t secret_len, const char *s2k_specifier)
|
|
|
|
{
|
|
|
|
crypto_digest_env_t *d;
|
|
|
|
uint8_t c;
|
|
|
|
size_t count;
|
|
|
|
char *tmp;
|
2004-12-02 05:33:01 +01:00
|
|
|
tor_assert(key_out_len < SIZE_T_CEILING);
|
2004-11-03 20:49:03 +01:00
|
|
|
|
|
|
|
#define EXPBIAS 6
|
|
|
|
c = s2k_specifier[8];
|
|
|
|
count = ((uint32_t)16 + (c & 15)) << ((c >> 4) + EXPBIAS);
|
|
|
|
#undef EXPBIAS
|
|
|
|
|
|
|
|
tor_assert(key_out_len <= DIGEST_LEN);
|
|
|
|
|
|
|
|
d = crypto_new_digest_env();
|
|
|
|
tmp = tor_malloc(8+secret_len);
|
|
|
|
memcpy(tmp,s2k_specifier,8);
|
|
|
|
memcpy(tmp+8,secret,secret_len);
|
|
|
|
secret_len += 8;
|
|
|
|
while (count) {
|
|
|
|
if (count >= secret_len) {
|
|
|
|
crypto_digest_add_bytes(d, tmp, secret_len);
|
|
|
|
count -= secret_len;
|
|
|
|
} else {
|
|
|
|
crypto_digest_add_bytes(d, tmp, count);
|
|
|
|
count = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
crypto_digest_get_digest(d, key_out, key_out_len);
|
|
|
|
tor_free(tmp);
|
|
|
|
crypto_free_digest_env(d);
|
|
|
|
}
|
|
|
|
|
2005-02-13 23:32:25 +01:00
|
|
|
#ifdef TOR_IS_MULTITHREADED
|
2006-09-29 20:13:37 +02:00
|
|
|
/** Helper: openssl uses this callback to manipulate mutexes. */
|
2005-02-13 23:32:25 +01:00
|
|
|
static void
|
|
|
|
_openssl_locking_cb(int mode, int n, const char *file, int line)
|
|
|
|
{
|
2006-06-05 00:42:13 +02:00
|
|
|
(void)file;
|
|
|
|
(void)line;
|
2005-04-01 04:37:10 +02:00
|
|
|
if (!_openssl_mutexes)
|
|
|
|
/* This is not a really good fix for the
|
|
|
|
* "release-freed-lock-from-separate-thread-on-shutdown" problem, but
|
|
|
|
* it can't hurt. */
|
|
|
|
return;
|
2005-02-13 23:32:25 +01:00
|
|
|
if (mode & CRYPTO_LOCK)
|
|
|
|
tor_mutex_acquire(_openssl_mutexes[n]);
|
|
|
|
else
|
|
|
|
tor_mutex_release(_openssl_mutexes[n]);
|
|
|
|
}
|
2005-09-30 03:09:52 +02:00
|
|
|
|
2006-09-29 20:13:37 +02:00
|
|
|
/** Helper: Construct mutexes, and set callbacks to help OpenSSL handle being
|
|
|
|
* multithreaded. */
|
2005-02-13 23:32:25 +01:00
|
|
|
static int
|
2005-09-30 03:09:52 +02:00
|
|
|
setup_openssl_threading(void)
|
|
|
|
{
|
2005-02-13 23:32:25 +01:00
|
|
|
int i;
|
|
|
|
int n = CRYPTO_num_locks();
|
2005-03-23 07:20:50 +01:00
|
|
|
_n_openssl_mutexes = n;
|
2005-02-13 23:32:25 +01:00
|
|
|
_openssl_mutexes = tor_malloc(n*sizeof(tor_mutex_t *));
|
2005-03-23 07:20:50 +01:00
|
|
|
for (i=0; i < n; ++i)
|
2005-02-13 23:32:25 +01:00
|
|
|
_openssl_mutexes[i] = tor_mutex_new();
|
|
|
|
CRYPTO_set_locking_callback(_openssl_locking_cb);
|
|
|
|
CRYPTO_set_id_callback(tor_get_thread_id);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#else
|
2005-09-30 03:09:52 +02:00
|
|
|
static int
|
|
|
|
setup_openssl_threading(void)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
2005-02-13 23:32:25 +01:00
|
|
|
#endif
|
2005-06-09 21:03:31 +02:00
|
|
|
|