2003-10-08 04:04:08 +02:00
|
|
|
/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
|
2002-07-24 16:02:39 +02:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/**
|
|
|
|
* \file crypto.c
|
|
|
|
*
|
|
|
|
* \brief Low-level cryptographic functions.
|
|
|
|
**/
|
|
|
|
|
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>
|
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
|
|
|
|
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"
|
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"
|
|
|
|
#elif OPENSSL_VERSION_NUMBER < 0x00906000l
|
|
|
|
#define OPENSSL_095
|
|
|
|
#endif
|
|
|
|
|
2004-05-01 22:46:28 +02:00
|
|
|
/* Certain functions that return a success code in OpenSSL 0.9.6 return void
|
2002-09-03 21:16:02 +02:00
|
|
|
* (and don't indicate errors) in OpenSSL version 0.9.5.
|
|
|
|
*
|
|
|
|
* [OpenSSL 0.9.5 matters, because it ships with Redhat 6.2.]
|
|
|
|
*/
|
|
|
|
#ifdef OPENSSL_095
|
|
|
|
#define RETURN_SSL_OUTCOME(exp) (exp); return 0
|
|
|
|
#else
|
|
|
|
#define RETURN_SSL_OUTCOME(exp) return !(exp)
|
|
|
|
#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)
|
|
|
|
|
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
|
|
|
};
|
|
|
|
|
|
|
|
struct crypto_cipher_env_t
|
|
|
|
{
|
2004-04-03 04:40:30 +02:00
|
|
|
unsigned char key[CIPHER_KEY_LEN];
|
|
|
|
aes_cnt_cipher_t *cipher;
|
2003-09-10 02:47:24 +02:00
|
|
|
};
|
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
struct crypto_dh_env_t {
|
|
|
|
DH *dh;
|
|
|
|
};
|
2003-06-13 23:13:37 +02: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
|
2004-04-03 04:40:30 +02:00
|
|
|
crypto_get_rsa_padding_overhead(int padding) {
|
|
|
|
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
|
2004-04-03 04:40:30 +02:00
|
|
|
crypto_get_rsa_padding(int padding) {
|
2004-04-01 05:08:35 +02:00
|
|
|
switch(padding)
|
|
|
|
{
|
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)";
|
|
|
|
if (doing) {
|
2004-10-13 07:54:58 +02:00
|
|
|
log(severity, "crypto error while %s: %s (in %s:%s)", doing, msg, lib, func);
|
2004-04-26 20:09:50 +02:00
|
|
|
} else {
|
|
|
|
log(severity, "crypto error: %s (in %s:%s)", msg, lib, func);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2004-05-10 05:53:24 +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
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
int crypto_global_init()
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2003-09-15 21:38:52 +02:00
|
|
|
if (!_crypto_global_initialized) {
|
|
|
|
ERR_load_crypto_strings();
|
|
|
|
_crypto_global_initialized = 1;
|
|
|
|
}
|
2002-07-24 16:02:39 +02:00
|
|
|
return 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
|
|
|
*/
|
2002-07-24 16:02:39 +02:00
|
|
|
int crypto_global_cleanup()
|
|
|
|
{
|
|
|
|
ERR_free_strings();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** used by tortls.c: wrap an RSA* in a crypto_pk_env_t. */
|
2003-09-10 02:47: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 12:27:54 +02:00
|
|
|
/** used by tortls.c: return the RSA* from a crypto_pk_env_t. */
|
2003-09-10 02:47:24 +02:00
|
|
|
RSA *_crypto_pk_env_get_rsa(crypto_pk_env_t *env)
|
|
|
|
{
|
2004-04-03 04:40:30 +02:00
|
|
|
return env->key;
|
2003-09-10 02:47:24 +02:00
|
|
|
}
|
|
|
|
|
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. */
|
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-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
|
|
|
*/
|
2004-04-03 04:40:30 +02:00
|
|
|
DH *_crypto_dh_env_get_dh(crypto_dh_env_t *dh)
|
|
|
|
{
|
|
|
|
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.
|
|
|
|
*/
|
2004-04-03 04:40:30 +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
|
|
|
*/
|
2002-07-24 16:02:39 +02:00
|
|
|
void crypto_free_pk_env(crypto_pk_env_t *env)
|
|
|
|
{
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(env);
|
2002-09-24 12:43:57 +02:00
|
|
|
|
|
|
|
if(--env->refs > 0)
|
|
|
|
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
|
|
|
|
2003-08-25 09:06:12 +02:00
|
|
|
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())) {
|
2003-10-10 03:48:03 +02:00
|
|
|
log_fn(LOG_WARN, "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
|
|
|
*/
|
2004-04-03 04:40:30 +02:00
|
|
|
crypto_cipher_env_t *crypto_new_cipher_env()
|
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
|
|
|
*/
|
2002-07-24 16:02:39 +02:00
|
|
|
void crypto_free_cipher_env(crypto_cipher_env_t *env)
|
|
|
|
{
|
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.
|
|
|
|
*/
|
2002-07-24 16:02:39 +02:00
|
|
|
int crypto_pk_generate_key(crypto_pk_env_t *env)
|
|
|
|
{
|
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
|
|
|
*/
|
2004-09-21 06:55:43 +02:00
|
|
|
static int 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
|
|
|
*/
|
2003-09-25 07:17:11 +02:00
|
|
|
int 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. */
|
|
|
|
contents = read_file_to_str(keyfile, 0);
|
|
|
|
if (!contents) {
|
|
|
|
log_fn(LOG_WARN, "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
|
|
|
*/
|
2004-10-13 07:54:58 +02:00
|
|
|
int crypto_pk_write_public_key_to_string(crypto_pk_env_t *env, char **dest, size_t *len) {
|
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-04-26 20:09:50 +02:00
|
|
|
if(!PEM_write_bio_RSAPublicKey(b, env->key)) {
|
|
|
|
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);
|
|
|
|
BIO_set_close(b, BIO_NOCLOSE); /* so BIO_free doesn't free buf */
|
|
|
|
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);
|
|
|
|
(*dest)[buf->length] = 0; /* null terminate it */
|
|
|
|
*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.
|
|
|
|
*/
|
2004-10-13 07:54:58 +02:00
|
|
|
int crypto_pk_read_public_key_from_string(crypto_pk_env_t *env, const char *src, size_t len) {
|
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-04-26 20:09:50 +02:00
|
|
|
if(!env->key) {
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2004-05-01 23:41:23 +02:00
|
|
|
/* Write the private key from 'env' into the file named by 'fname',
|
|
|
|
* 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);
|
2004-10-27 08:03:28 +02:00
|
|
|
strlcpy(s, cp, len+1);
|
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);
|
2003-09-26 20:44:20 +02:00
|
|
|
free(s);
|
2003-09-26 20:27:35 +02:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2004-10-07 05:11:42 +02:00
|
|
|
/** Allocate a new string in *<b>out</b>, containing the public portion of the
|
|
|
|
* RSA key in <b>env</b>, encoded first with DER, then in base-64. Return the
|
|
|
|
* length of the encoded representation on success, and -1 on failure.
|
|
|
|
*
|
|
|
|
* <i>This function is for temporary use only. We need a simple
|
|
|
|
* one-line representation for keys to work around a bug in parsing
|
|
|
|
* directories containing "opt keyword\n-----BEGIN OBJECT----" entries
|
|
|
|
* in versions of Tor up to 0.0.9pre2.</i>
|
|
|
|
*/
|
|
|
|
int crypto_pk_DER64_encode_public_key(crypto_pk_env_t *env, char **out)
|
2004-10-06 15:26:10 +02:00
|
|
|
{
|
|
|
|
int len;
|
2004-10-07 05:11:42 +02:00
|
|
|
char buf[PK_BYTES*2]; /* Too long, but hey, stacks are big. */
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(out);
|
2004-10-07 05:11:42 +02:00
|
|
|
len = crypto_pk_asn1_encode(env, buf, sizeof(buf));
|
2004-10-06 15:26:10 +02:00
|
|
|
if (len < 0) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
*out = tor_malloc(len * 2); /* too long, but safe. */
|
2004-10-07 05:11:42 +02:00
|
|
|
if (base64_encode(*out, len*2, buf, len) < 0) {
|
2004-10-06 15:26:10 +02:00
|
|
|
log_fn(LOG_WARN, "Error base64-encoding DER-encoded key");
|
|
|
|
tor_free(*out);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-10-07 05:11:42 +02:00
|
|
|
/* Remove spaces */
|
|
|
|
tor_strstrip(*out, " \r\n\t");
|
|
|
|
return strlen(*out);
|
2004-10-06 15:26:10 +02:00
|
|
|
}
|
|
|
|
|
2004-10-07 05:11:42 +02:00
|
|
|
/** Decode a base-64 encoded DER representation of an RSA key from <b>in</b>,
|
|
|
|
* and store the result in <b>env</b>. Return 0 on success, -1 on failure.
|
|
|
|
*
|
|
|
|
* <i>This function is for temporary use only. We need a simple
|
|
|
|
* one-line representation for keys to work around a bug in parsing
|
|
|
|
* directories containing "opt keyword\n-----BEGIN OBJECT----" entries
|
|
|
|
* in versions of Tor up to 0.0.9pre2.</i>
|
|
|
|
*/
|
|
|
|
crypto_pk_env_t *crypto_pk_DER64_decode_public_key(const char *in)
|
2004-10-06 15:26:10 +02:00
|
|
|
{
|
2004-10-07 22:58:53 +02:00
|
|
|
char partitioned[PK_BYTES*2 + 16];
|
2004-10-07 05:11:42 +02:00
|
|
|
char buf[PK_BYTES*2];
|
2004-10-06 15:26:10 +02:00
|
|
|
int len;
|
2004-10-07 05:11:42 +02:00
|
|
|
tor_assert(in);
|
2004-10-06 15:26:10 +02:00
|
|
|
len = strlen(in);
|
2004-10-07 05:11:42 +02:00
|
|
|
|
|
|
|
if (strlen(in) > PK_BYTES*2) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
/* base64_decode doesn't work unless we insert linebreaks every 64
|
|
|
|
* characters. how dumb. */
|
2004-10-07 23:37:06 +02:00
|
|
|
if (tor_strpartition(partitioned, sizeof(partitioned), in, "\n", 64,
|
|
|
|
ALWAYS_TERMINATE))
|
2004-10-07 22:58:53 +02:00
|
|
|
return NULL;
|
|
|
|
len = base64_decode(buf, sizeof(buf), partitioned, strlen(partitioned));
|
2004-10-07 05:11:42 +02:00
|
|
|
if (len<0) {
|
2004-10-06 15:26:10 +02:00
|
|
|
log_fn(LOG_WARN,"Error base-64 decoding key");
|
2004-10-07 05:11:42 +02:00
|
|
|
return NULL;
|
2004-10-06 15:26:10 +02:00
|
|
|
}
|
2004-10-07 05:11:42 +02:00
|
|
|
return crypto_pk_asn1_decode(buf, len);
|
2004-10-06 15:26:10 +02:00
|
|
|
}
|
|
|
|
|
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
|
|
|
*/
|
2002-07-25 10:17:22 +02:00
|
|
|
int crypto_pk_check_key(crypto_pk_env_t *env)
|
|
|
|
{
|
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
|
|
|
*/
|
2002-08-22 09:30:03 +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. */
|
2002-08-22 09:30:03 +02:00
|
|
|
int crypto_pk_keysize(crypto_pk_env_t *env)
|
|
|
|
{
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(env);
|
|
|
|
tor_assert(env->key);
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
return 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
|
|
|
*/
|
2002-09-24 12:43:57 +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-04-03 04:40:30 +02:00
|
|
|
int crypto_pk_public_encrypt(crypto_pk_env_t *env, const unsigned char *from, int fromlen, unsigned char *to, 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
|
|
|
|
2004-04-26 20:09:50 +02:00
|
|
|
r = RSA_public_encrypt(fromlen, (unsigned char*)from, to, env->key,
|
2004-04-03 04:40:30 +02:00
|
|
|
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-05-12 21:30:28 +02:00
|
|
|
int crypto_pk_private_decrypt(crypto_pk_env_t *env, const unsigned char *from, int fromlen, unsigned char *to, 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
|
|
|
|
2004-04-26 20:09:50 +02:00
|
|
|
r = RSA_private_decrypt(fromlen, (unsigned char*)from, to, env->key,
|
2004-04-03 04:40:30 +02:00
|
|
|
crypto_get_rsa_padding(padding));
|
2004-05-01 23:41:23 +02:00
|
|
|
if (r<0) {
|
2004-05-12 21:30:28 +02:00
|
|
|
crypto_log_errors(warnOnFailure?LOG_WARN:LOG_INFO,
|
|
|
|
"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-04-03 04:40:30 +02:00
|
|
|
int crypto_pk_public_checksig(crypto_pk_env_t *env, const unsigned char *from, int fromlen, unsigned char *to)
|
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);
|
2004-04-26 20:09:50 +02:00
|
|
|
r = RSA_public_decrypt(fromlen, (unsigned char*)from, to, env->key, RSA_PKCS1_PADDING);
|
|
|
|
|
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
|
|
|
/** 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
|
2004-05-01 23:41:23 +02:00
|
|
|
* -1.
|
|
|
|
*/
|
2004-04-03 04:40:30 +02:00
|
|
|
int crypto_pk_private_sign(crypto_pk_env_t *env, const unsigned char *from, int fromlen, unsigned char *to)
|
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);
|
2004-04-03 04:40:30 +02:00
|
|
|
if (!env->key->p)
|
|
|
|
/* Not a private key */
|
|
|
|
return -1;
|
2003-05-07 04:13:23 +02:00
|
|
|
|
2004-04-26 20:09:50 +02:00
|
|
|
r = RSA_private_encrypt(fromlen, (unsigned char*)from, to, env->key, RSA_PKCS1_PADDING);
|
2004-05-02 01:29:20 +02:00
|
|
|
if (r<0) {
|
2004-04-26 20:09:50 +02:00
|
|
|
crypto_log_errors(LOG_WARN, "generating 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-04-05 19:36:30 +02:00
|
|
|
int crypto_pk_public_checksig_digest(crypto_pk_env_t *env, const unsigned char *data, int datalen, const unsigned char *sig, int siglen)
|
2004-04-02 00:10:33 +02:00
|
|
|
{
|
2004-04-03 04:40:30 +02:00
|
|
|
char digest[DIGEST_LEN];
|
|
|
|
char buf[PK_BYTES+1];
|
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-04-03 04:40:30 +02:00
|
|
|
if (crypto_digest(data,datalen,digest)<0) {
|
2004-04-02 00:10:33 +02:00
|
|
|
log_fn(LOG_WARN, "couldn't compute digest");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
r = crypto_pk_public_checksig(env,sig,siglen,buf);
|
2004-04-03 04:40:30 +02:00
|
|
|
if (r != DIGEST_LEN) {
|
2004-04-02 00:10:33 +02:00
|
|
|
log_fn(LOG_WARN, "Invalid signature");
|
|
|
|
return -1;
|
|
|
|
}
|
2004-04-03 04:40:30 +02:00
|
|
|
if (memcmp(buf, digest, DIGEST_LEN)) {
|
2004-04-02 00:10:33 +02:00
|
|
|
log_fn(LOG_WARN, "Signature mismatched with digest.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
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-04-03 04:40:30 +02:00
|
|
|
int crypto_pk_private_sign_digest(crypto_pk_env_t *env, const unsigned char *from, int fromlen, unsigned char *to)
|
2004-04-02 00:10:33 +02:00
|
|
|
{
|
2004-04-03 04:40:30 +02:00
|
|
|
char digest[DIGEST_LEN];
|
|
|
|
if (crypto_digest(from,fromlen,digest)<0)
|
2004-05-01 23:41:23 +02:00
|
|
|
return -1;
|
2004-04-03 04:40:30 +02:00
|
|
|
return crypto_pk_private_sign(env,digest,DIGEST_LEN,to);
|
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
|
|
|
*/
|
2004-04-03 04:40:30 +02:00
|
|
|
int crypto_pk_public_hybrid_encrypt(crypto_pk_env_t *env,
|
|
|
|
const unsigned char *from,
|
|
|
|
int fromlen, unsigned char *to,
|
2004-04-06 22:55:46 +02:00
|
|
|
int padding, int force)
|
2004-04-01 05:08:35 +02:00
|
|
|
{
|
|
|
|
int overhead, pkeylen, outlen, r, symlen;
|
|
|
|
crypto_cipher_env_t *cipher = NULL;
|
2004-04-03 04:40:30 +02:00
|
|
|
char buf[PK_BYTES+1];
|
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. */
|
|
|
|
return crypto_pk_public_encrypt(env,from,fromlen,to,padding);
|
|
|
|
}
|
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;
|
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
|
|
|
|
|
|
|
outlen = crypto_pk_public_encrypt(env,buf,pkeylen-overhead,to,padding);
|
|
|
|
if (outlen!=pkeylen) {
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
r = crypto_cipher_encrypt(cipher,
|
2004-04-03 04:40:30 +02:00
|
|
|
from+pkeylen-overhead-CIPHER_KEY_LEN, symlen,
|
|
|
|
to+outlen);
|
2004-04-01 05:08:35 +02:00
|
|
|
|
|
|
|
if (r<0) goto err;
|
2004-04-03 04:40:30 +02:00
|
|
|
memset(buf, 0, sizeof(buf));
|
2004-04-01 05:08:35 +02:00
|
|
|
crypto_free_cipher_env(cipher);
|
|
|
|
return outlen + symlen;
|
|
|
|
err:
|
2004-04-03 04:40:30 +02:00
|
|
|
memset(buf, 0, sizeof(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. */
|
2004-04-03 04:40:30 +02:00
|
|
|
int crypto_pk_private_hybrid_decrypt(crypto_pk_env_t *env,
|
|
|
|
const unsigned char *from,
|
|
|
|
int fromlen, unsigned char *to,
|
2004-05-12 21:30:28 +02:00
|
|
|
int padding, int warnOnFailure)
|
2004-04-01 05:08:35 +02:00
|
|
|
{
|
|
|
|
int overhead, pkeylen, outlen, r;
|
|
|
|
crypto_cipher_env_t *cipher = NULL;
|
2004-04-03 04:40:30 +02:00
|
|
|
char buf[PK_BYTES+1];
|
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);
|
|
|
|
|
|
|
|
if (fromlen <= pkeylen) {
|
2004-05-12 21:30:28 +02:00
|
|
|
return crypto_pk_private_decrypt(env,from,fromlen,to,padding,warnOnFailure);
|
2004-04-01 05:08:35 +02:00
|
|
|
}
|
2004-05-12 21:30:28 +02:00
|
|
|
outlen = crypto_pk_private_decrypt(env,from,pkeylen,buf,padding,warnOnFailure);
|
2004-04-01 05:08:35 +02:00
|
|
|
if (outlen<0) {
|
2004-05-12 21:30:28 +02:00
|
|
|
log_fn(warnOnFailure?LOG_WARN:LOG_INFO, "Error decrypting public-key data");
|
2004-04-01 05:08:35 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-04-03 04:40:30 +02:00
|
|
|
if (outlen < CIPHER_KEY_LEN) {
|
2004-05-12 21:30:28 +02:00
|
|
|
log_fn(warnOnFailure?LOG_WARN:LOG_INFO, "No room for a symmetric key");
|
2004-04-01 05:08:35 +02:00
|
|
|
return -1;
|
|
|
|
}
|
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) {
|
|
|
|
return -1;
|
|
|
|
}
|
2004-04-03 04:40:30 +02:00
|
|
|
memcpy(to,buf+CIPHER_KEY_LEN,outlen-CIPHER_KEY_LEN);
|
|
|
|
outlen -= CIPHER_KEY_LEN;
|
2004-04-01 05:08:35 +02:00
|
|
|
r = crypto_cipher_decrypt(cipher, from+pkeylen, fromlen-pkeylen,
|
2004-04-03 04:40:30 +02:00
|
|
|
to+outlen);
|
2004-04-01 05:08:35 +02:00
|
|
|
if (r<0)
|
|
|
|
goto err;
|
2004-04-03 04:40:30 +02:00
|
|
|
memset(buf,0,sizeof(buf));
|
2004-04-01 05:08:35 +02:00
|
|
|
crypto_free_cipher_env(cipher);
|
|
|
|
return outlen + (fromlen-pkeylen);
|
|
|
|
err:
|
2004-04-03 04:40:30 +02:00
|
|
|
memset(buf,0,sizeof(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
|
|
|
*/
|
2004-03-30 21:47:32 +02:00
|
|
|
int crypto_pk_asn1_encode(crypto_pk_env_t *pk, char *dest, int dest_len)
|
|
|
|
{
|
|
|
|
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
|
|
|
*/
|
|
|
|
crypto_pk_env_t *crypto_pk_asn1_decode(const char *str, int len)
|
|
|
|
{
|
|
|
|
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
|
|
|
*/
|
|
|
|
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");
|
2003-09-25 07:17:11 +02:00
|
|
|
free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-04-03 04:40:30 +02:00
|
|
|
if (crypto_digest(buf, len, digest_out) < 0) {
|
2003-09-25 07:17:11 +02:00
|
|
|
free(buf);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-04-12 07:27:38 +02:00
|
|
|
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
|
|
|
{
|
2004-04-03 04:40:30 +02:00
|
|
|
unsigned char digest[DIGEST_LEN];
|
2004-10-07 22:58:53 +02:00
|
|
|
unsigned 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) {
|
2004-10-07 23:37:06 +02:00
|
|
|
if (tor_strpartition(fp_out, FINGERPRINT_LEN+1, hexdigest, " ", 4,
|
|
|
|
NEVER_TERMINATE)<0)
|
|
|
|
return -1;
|
2004-10-07 22:58:53 +02:00
|
|
|
} else {
|
|
|
|
strcpy(fp_out, hexdigest);
|
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-03-19 21:50:12 +01:00
|
|
|
if (!isspace((int)s[i])) return 0;
|
2003-09-26 22:41:23 +02:00
|
|
|
} else {
|
2004-03-19 21:50:12 +01:00
|
|
|
if (!isxdigit((int)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.
|
|
|
|
*/
|
2002-08-22 09:30:03 +02:00
|
|
|
int crypto_cipher_generate_key(crypto_cipher_env_t *env)
|
|
|
|
{
|
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
|
|
|
return crypto_rand(CIPHER_KEY_LEN, env->key);
|
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
|
|
|
*/
|
2004-04-03 04:40:30 +02:00
|
|
|
int crypto_cipher_set_key(crypto_cipher_env_t *env, const unsigned 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
|
|
|
*/
|
2004-04-03 04:40:30 +02:00
|
|
|
const unsigned 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
|
|
|
*/
|
2002-07-25 10:17:22 +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
|
|
|
*/
|
2002-07-25 10:17:22 +02:00
|
|
|
int crypto_cipher_decrypt_init_cipher(crypto_cipher_env_t *env)
|
|
|
|
{
|
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-04-03 04:40:30 +02:00
|
|
|
int crypto_cipher_encrypt(crypto_cipher_env_t *env, const unsigned char *from, unsigned int fromlen, unsigned char *to)
|
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-04-03 04:40:30 +02:00
|
|
|
int crypto_cipher_decrypt(crypto_cipher_env_t *env, const unsigned char *from, unsigned int fromlen, unsigned char *to)
|
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
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Move the position of the cipher stream backwards by <b>delta</b> bytes.
|
2004-10-07 22:58:53 +02:00
|
|
|
* Return 0 on suuccess, -1 on failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2003-12-23 08:43:05 +01:00
|
|
|
int
|
|
|
|
crypto_cipher_rewind(crypto_cipher_env_t *env, long delta)
|
|
|
|
{
|
|
|
|
return crypto_cipher_advance(env, -delta);
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Move the position of the cipher stream forwards by <b>delta</b> bytes.
|
2004-10-07 22:58:53 +02:00
|
|
|
* Return 0 on suuccess, -1 on failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2003-06-30 21:18:32 +02:00
|
|
|
int
|
|
|
|
crypto_cipher_advance(crypto_cipher_env_t *env, long delta)
|
|
|
|
{
|
2004-04-03 04:40:30 +02:00
|
|
|
aes_adjust_counter(env->cipher, delta);
|
|
|
|
return 0;
|
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-10-07 22:58:53 +02:00
|
|
|
* Return 0 on suuccess, -1 on failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2004-04-03 04:40:30 +02:00
|
|
|
int crypto_digest(const unsigned char *m, int len, unsigned char *digest)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2004-10-17 00:28:11 +02:00
|
|
|
tor_assert(m);
|
|
|
|
tor_assert(digest);
|
2002-07-25 10:17:22 +02:00
|
|
|
return (SHA1(m,len,digest) == NULL);
|
2002-07-24 16:02:39 +02:00
|
|
|
}
|
|
|
|
|
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
|
2003-12-16 09:13:26 +01: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
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
void crypto_digest_get_digest(crypto_digest_env_t *digest,
|
2003-12-16 06:47:21 +01:00
|
|
|
char *out, size_t out_len)
|
2003-12-16 06:29:04 +01:00
|
|
|
{
|
2004-04-03 04:40:30 +02:00
|
|
|
static 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. */
|
2004-10-27 20:16:37 +02:00
|
|
|
static void init_dh_param(void) {
|
2003-05-01 02:53:46 +02:00
|
|
|
BIGNUM *p, *g;
|
|
|
|
int r;
|
|
|
|
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-12-16 06:29:04 +01:00
|
|
|
#if 0
|
2003-05-01 02:53:46 +02:00
|
|
|
/* This is from draft-ietf-ipsec-ike-modp-groups-05.txt. It's a safe
|
|
|
|
prime, and supposedly it equals:
|
|
|
|
2^1536 - 2^1472 - 1 + 2^64 * { [2^1406 pi] + 741804 }
|
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
r = BN_hex2bn(&p,
|
2003-12-16 09:13:26 +01:00
|
|
|
"FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
|
|
|
|
"29024E088A67CC74020BBEA63B139B22514A08798E3404DD"
|
|
|
|
"EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
|
|
|
|
"E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED"
|
|
|
|
"EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
|
|
|
|
"C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F"
|
|
|
|
"83655D23DCA3AD961C62F356208552BB9ED529077096966D"
|
|
|
|
"670C354E4ABC9804F1746C08CA237327FFFFFFFFFFFFFFFF");
|
2003-05-07 04:28:42 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
/* 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 }.
|
|
|
|
*/
|
2003-09-04 18:05:08 +02:00
|
|
|
/* See also rfc 3536 */
|
2003-05-07 04:28:42 +02:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
*/
|
2003-05-01 02:53:46 +02:00
|
|
|
crypto_dh_env_t *crypto_dh_new()
|
|
|
|
{
|
|
|
|
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;
|
|
|
|
|
|
|
|
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 */
|
|
|
|
if (res) free(res);
|
|
|
|
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
|
|
|
*/
|
2003-05-01 02:53:46 +02:00
|
|
|
int crypto_dh_get_bytes(crypto_dh_env_t *dh)
|
|
|
|
{
|
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.
|
|
|
|
*/
|
2004-04-01 22:04:54 +02:00
|
|
|
int crypto_dh_generate_public(crypto_dh_env_t *dh)
|
|
|
|
{
|
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
|
|
|
}
|
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
|
|
|
*/
|
2004-10-12 22:20:19 +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);
|
|
|
|
if (pubkey_len < (size_t)bytes)
|
2003-05-01 02:53:46 +02:00
|
|
|
return -1;
|
2003-12-16 06:29:04 +01:00
|
|
|
|
2003-05-01 02:53:46 +02:00
|
|
|
memset(pubkey, 0, pubkey_len);
|
|
|
|
BN_bn2bin(dh->dh->pub_key, pubkey+(pubkey_len-bytes));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
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-10-07 22:58:53 +02:00
|
|
|
* to <b>secret_out</b>. Return the number of bytes generated on suuccess,
|
|
|
|
* 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.)
|
|
|
|
*/
|
2003-12-16 06:29:04 +01:00
|
|
|
int crypto_dh_compute_secret(crypto_dh_env_t *dh,
|
2004-10-12 22:20:19 +02:00
|
|
|
const char *pubkey, size_t pubkey_len,
|
|
|
|
char *secret_out, size_t secret_bytes_out)
|
2003-05-01 02:53:46 +02:00
|
|
|
{
|
2004-04-03 04:40:30 +02:00
|
|
|
unsigned char hash[DIGEST_LEN];
|
2003-07-30 21:10:20 +02:00
|
|
|
unsigned char *secret_tmp = NULL;
|
|
|
|
BIGNUM *pubkey_bn = NULL;
|
2004-10-12 22:20:19 +02:00
|
|
|
size_t secret_len=0;
|
|
|
|
unsigned int i;
|
|
|
|
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
|
|
|
|
2003-05-01 02:53:46 +02:00
|
|
|
if (!(pubkey_bn = BN_bin2bn(pubkey, pubkey_len, NULL)))
|
2003-07-30 21:10:20 +02:00
|
|
|
goto error;
|
|
|
|
secret_tmp = tor_malloc(crypto_dh_get_bytes(dh)+1);
|
2004-10-12 22:20:19 +02:00
|
|
|
result = DH_compute_key(secret_tmp, pubkey_bn, dh->dh);
|
|
|
|
if(result < 0) {
|
|
|
|
log_fn(LOG_WARN,"DH_compute_key() failed.");
|
|
|
|
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. */
|
2004-04-03 04:40:30 +02:00
|
|
|
for (i = 0; i < secret_bytes_out; i += DIGEST_LEN) {
|
|
|
|
secret_tmp[secret_len] = (unsigned char) i/DIGEST_LEN;
|
|
|
|
if (crypto_digest(secret_tmp, secret_len+1, hash))
|
2003-07-30 21:10:20 +02:00
|
|
|
goto error;
|
2004-04-03 04:40:30 +02:00
|
|
|
memcpy(secret_out+i, hash, MIN(DIGEST_LEN, secret_bytes_out-i));
|
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-10-12 22:20:19 +02:00
|
|
|
if(result < 0)
|
|
|
|
return result;
|
|
|
|
else
|
|
|
|
return secret_len;
|
2003-05-01 02:53:46 +02:00
|
|
|
}
|
2004-10-12 22:20:19 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Free a DH key exchange object.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2003-05-01 02:53:46 +02:00
|
|
|
void crypto_dh_free(crypto_dh_env_t *dh)
|
|
|
|
{
|
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);
|
|
|
|
free(dh);
|
|
|
|
}
|
|
|
|
|
2002-07-24 16:02:39 +02:00
|
|
|
/* random numbers */
|
2004-05-01 23:41:23 +02:00
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Seed OpenSSL's random number generator with DIGEST_LEN bytes from the
|
2004-10-07 22:58:53 +02:00
|
|
|
* operating system. Return 0 on suuccess, -1 on failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2004-10-27 20:16:37 +02:00
|
|
|
int crypto_seed_rng(void)
|
2004-03-11 06:14:06 +01:00
|
|
|
{
|
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;
|
2004-04-03 04:40:30 +02:00
|
|
|
char buf[DIGEST_LEN+1];
|
2004-03-11 06:14:06 +01:00
|
|
|
|
|
|
|
if (!provider_set) {
|
|
|
|
if (!CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, 0)) {
|
|
|
|
if (GetLastError() != NTE_BAD_KEYSET) {
|
2004-03-12 14:02:16 +01:00
|
|
|
log_fn(LOG_ERR,"Can't get CryptoAPI provider [1]");
|
|
|
|
return -1;
|
2004-03-11 06:14:06 +01:00
|
|
|
}
|
|
|
|
/* Yes, we need to try it twice. */
|
|
|
|
if (!CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL,
|
2004-03-12 14:02:16 +01:00
|
|
|
CRYPT_NEWKEYSET)) {
|
|
|
|
log_fn(LOG_ERR,"Can't get CryptoAPI provider [2]");
|
|
|
|
return -1;
|
2004-03-11 06:14:06 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
provider_set = 1;
|
|
|
|
}
|
2004-04-03 04:40:30 +02:00
|
|
|
if (!CryptGenRandom(provider, DIGEST_LEN, buf)) {
|
2004-03-11 06:14:06 +01:00
|
|
|
log_fn(LOG_ERR,"Can't get entropy from CryptoAPI.");
|
|
|
|
return -1;
|
|
|
|
}
|
2004-04-03 04:40:30 +02:00
|
|
|
RAND_seed(buf, DIGEST_LEN);
|
2004-03-11 06:14:06 +01:00
|
|
|
/* And add the current screen state to the entopy pool for
|
|
|
|
* good measure. */
|
|
|
|
RAND_screen();
|
|
|
|
return 0;
|
|
|
|
#else
|
2004-10-27 23:14:11 +02:00
|
|
|
static const char *filenames[] = {
|
2003-06-13 23:13:37 +02:00
|
|
|
"/dev/srandom", "/dev/urandom", "/dev/random", NULL
|
|
|
|
};
|
2004-04-26 20:09:50 +02:00
|
|
|
int fd;
|
2003-06-17 22:19:41 +02:00
|
|
|
int i, n;
|
2004-04-03 04:40:30 +02:00
|
|
|
char buf[DIGEST_LEN+1];
|
2003-12-16 06:29:04 +01:00
|
|
|
|
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;
|
2003-06-18 00:18:26 +02:00
|
|
|
log_fn(LOG_INFO, "Seeding RNG from %s", filenames[i]);
|
2004-04-26 20:09:50 +02:00
|
|
|
n = read(fd, buf, DIGEST_LEN);
|
|
|
|
close(fd);
|
2004-04-03 04:40:30 +02:00
|
|
|
if (n != DIGEST_LEN) {
|
2003-10-10 03:48:03 +02:00
|
|
|
log_fn(LOG_WARN, "Error reading from entropy source");
|
2003-06-13 23:13:37 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2004-04-03 04:40:30 +02:00
|
|
|
RAND_seed(buf, DIGEST_LEN);
|
2003-06-13 23:13:37 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-10-10 03:48:03 +02:00
|
|
|
log_fn(LOG_WARN, "Cannot seed RNG -- no entropy source found.");
|
2003-06-13 23:13:37 +02:00
|
|
|
return -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
|
|
|
*/
|
2002-07-24 16:02:39 +02:00
|
|
|
int crypto_rand(unsigned int n, unsigned char *to)
|
|
|
|
{
|
2004-04-26 20:09:50 +02:00
|
|
|
int r;
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(to);
|
2004-04-26 20:09:50 +02:00
|
|
|
r = RAND_bytes(to, n);
|
|
|
|
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-05-10 05:53:24 +02:00
|
|
|
/** Write n bytes of pseudorandom data to <b>to</b>. Return 0 on
|
|
|
|
* success, -1 on failure.
|
2004-05-01 23:41:23 +02:00
|
|
|
*/
|
2003-11-12 05:12:35 +01:00
|
|
|
void crypto_pseudo_rand(unsigned int n, unsigned char *to)
|
2002-07-24 16:02:39 +02:00
|
|
|
{
|
2004-04-25 21:59:38 +02:00
|
|
|
tor_assert(to);
|
2003-11-12 05:12:35 +01:00
|
|
|
if (RAND_pseudo_bytes(to, n) == -1) {
|
|
|
|
log_fn(LOG_ERR, "RAND_pseudo_bytes failed unexpectedly.");
|
2004-04-26 20:09:50 +02:00
|
|
|
crypto_log_errors(LOG_WARN, "generating random data");
|
2003-11-12 05:12:35 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-10 05:53:24 +02:00
|
|
|
/** Return a pseudorandom integer, choosen uniformly from the values
|
2004-05-10 12:27:54 +02:00
|
|
|
* between 0 and max-1. */
|
2003-11-12 05:28:30 +01:00
|
|
|
int crypto_pseudo_rand_int(unsigned int max) {
|
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);
|
|
|
|
while(1) {
|
|
|
|
crypto_pseudo_rand(sizeof(val), (unsigned char*) &val);
|
|
|
|
if (val < cutoff)
|
|
|
|
return val % max;
|
|
|
|
}
|
2002-07-25 10:17:22 +02:00
|
|
|
}
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
EVP_EncodeInit(&ctx);
|
2003-12-09 00:45:37 +01:00
|
|
|
EVP_EncodeUpdate(&ctx, dest, &len, (char*) src, srclen);
|
2003-05-07 20:30:46 +02:00
|
|
|
EVP_EncodeFinal(&ctx, 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-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;
|
|
|
|
|
|
|
|
EVP_DecodeInit(&ctx);
|
2003-12-09 00:45:37 +01:00
|
|
|
EVP_DecodeUpdate(&ctx, dest, &len, (char*) src, srclen);
|
2003-05-07 04:13:23 +02:00
|
|
|
EVP_DecodeFinal(&ctx, dest, &ret);
|
|
|
|
ret += len;
|
|
|
|
return ret;
|
|
|
|
}
|
2004-03-30 21:47:32 +02:00
|
|
|
|
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-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-10-12 22:20:19 +02:00
|
|
|
void base16_encode(char *dest, size_t destlen, const char *src, size_t srclen)
|
2004-07-01 03:16:59 +02:00
|
|
|
{
|
|
|
|
const char *end;
|
|
|
|
char *cp;
|
|
|
|
|
2004-07-22 00:34:32 +02:00
|
|
|
tor_assert(destlen >= srclen*2+1);
|
2004-07-01 03:16:59 +02:00
|
|
|
|
|
|
|
cp = dest;
|
|
|
|
end = src+srclen;
|
|
|
|
while (src<end) {
|
|
|
|
sprintf(cp,"%02X",*(const uint8_t*)src);
|
|
|
|
++src;
|
|
|
|
cp += 2;
|
|
|
|
}
|
2004-07-03 01:40:03 +02:00
|
|
|
*cp = '\0';
|
2004-07-01 03:16:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static const char HEX_DIGITS[] = "0123456789ABCDEFabcdef";
|
|
|
|
|
|
|
|
static INLINE int hex_decode_digit(char c)
|
|
|
|
{
|
|
|
|
const char *cp;
|
|
|
|
int n;
|
|
|
|
cp = strchr(HEX_DIGITS, c);
|
|
|
|
if (!cp)
|
|
|
|
return -1;
|
|
|
|
n = cp-HEX_DIGITS;
|
|
|
|
if (n<=15)
|
|
|
|
return n; /* digit or uppercase */
|
|
|
|
else
|
|
|
|
return n-6; /* lowercase */
|
|
|
|
}
|
|
|
|
|
2004-10-12 22:20:19 +02:00
|
|
|
int base16_decode(char *dest, size_t destlen, const char *src, size_t srclen)
|
2004-07-01 03:16:59 +02:00
|
|
|
{
|
|
|
|
const char *end;
|
|
|
|
int v1,v2;
|
|
|
|
if ((srclen % 2) != 0)
|
|
|
|
return -1;
|
|
|
|
if (destlen < srclen/2)
|
|
|
|
return -1;
|
|
|
|
end = src+srclen;
|
|
|
|
while (src<end) {
|
|
|
|
v1 = hex_decode_digit(*src);
|
|
|
|
v2 = hex_decode_digit(*(src+1));
|
|
|
|
if(v1<0||v2<0)
|
|
|
|
return -1;
|
|
|
|
*(uint8_t*)dest = (v1<<4)|v2;
|
|
|
|
++dest;
|
2004-07-03 01:40:03 +02:00
|
|
|
src+=2;
|
2004-07-01 03:16:59 +02:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
/*
|
|
|
|
Local Variables:
|
|
|
|
mode:c
|
|
|
|
indent-tabs-mode:nil
|
|
|
|
c-basic-offset:2
|
|
|
|
End:
|
|
|
|
*/
|