Commit 137b577b authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

Refactor the heck out of crypto interface: admit that we will stick with one... 

Refactor the heck out of crypto interface: admit that we will stick with one ciphersuite at a time, make const things const, and stop putting openssl in the headers.


svn:r1458
parent 3dc3d0c4

src/common/aes.c

+3 −3
Changes for src/common/aes.c: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ _aes_fill_buf(aes_cnt_cipher_t *cipher) 
aes_cnt_cipher_t*

aes_new_cipher()

{

  aes_cnt_cipher_t* result = (aes_cnt_cipher_t*) tor_malloc(sizeof(aes_cnt_cipher_t));

  aes_cnt_cipher_t* result = tor_malloc(sizeof(aes_cnt_cipher_t));

  memset(result->rk, 0, 4*(MAXNR+1));

  memset(result->buf, 0, 16);
@@ -75,7 +75,7 @@ aes_new_cipher() 
}



void

aes_set_key(aes_cnt_cipher_t *cipher, unsigned char *key, int key_bits)

aes_set_key(aes_cnt_cipher_t *cipher, const unsigned char *key, int key_bits)

{

  cipher->nr = rijndaelKeySetupEnc(cipher->rk, key, key_bits);

  cipher->counter0 = 0;
@@ -93,7 +93,7 @@ aes_free_cipher(aes_cnt_cipher_t *cipher) 
}



void

aes_crypt(aes_cnt_cipher_t *cipher, char *input, int len, char *output)

aes_crypt(aes_cnt_cipher_t *cipher, const char *input, int len, char *output)

{

  int c = cipher->pos;

  if (!len) return;

src/common/aes.h

+2 −2
Changes for src/common/aes.h: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ typedef struct aes_cnt_cipher aes_cnt_cipher_t; 


aes_cnt_cipher_t* aes_new_cipher();

void aes_free_cipher(aes_cnt_cipher_t *cipher);

void aes_set_key(aes_cnt_cipher_t *cipher, unsigned char *key, int key_bits);

void aes_crypt(aes_cnt_cipher_t *cipher, char *input, int len, char *output);

void aes_set_key(aes_cnt_cipher_t *cipher, const unsigned char *key, int key_bits);

void aes_crypt(aes_cnt_cipher_t *cipher, const char *input, int len, char *output);

uint64_t aes_get_counter(aes_cnt_cipher_t *cipher);

void aes_set_counter(aes_cnt_cipher_t *cipher, uint64_t counter);

void aes_adjust_counter(aes_cnt_cipher_t *cipher, long delta);

src/common/crypto.c

+164 −384

File changed.

Preview size limit exceeded, changes collapsed.

src/common/crypto.h

+42 −44
Changes for src/common/crypto.h: 42 added lines, 44 removed lines.
Original line number Diff line number Diff line
@@ -6,35 +6,32 @@ 
#define __CRYPTO_H



#include <stdio.h>

#include <openssl/rsa.h>

#include <openssl/dh.h>



/* available encryption primitives */

#define CRYPTO_CIPHER_IDENTITY 0

#define CRYPTO_CIPHER_DES 1

#define CRYPTO_CIPHER_RC4 2

#define CRYPTO_CIPHER_3DES 3

#define CRYPTO_CIPHER_AES_CTR 4



#define CRYPTO_PK_RSA 0



#define CRYPTO_SHA1_DIGEST 0

#define DIGEST_LEN 20

#define CIPHER_KEY_LEN 16

#define CIPHER_IV_LEN 0

#define PK_BITS 1024

#define PK_BYTES (PK_BITS/8)

#define CRYPTO_DH_SIZE (1024 / 8)



#define CRYPTO_SHA1_DIGEST_LEN 20

#define PK_NO_PADDING         60000

#define PK_PKCS1_PADDING      60001

#define PK_PKCS1_OAEP_PADDING 60002



typedef struct crypto_pk_env_t crypto_pk_env_t;

typedef struct crypto_cipher_env_t crypto_cipher_env_t;

typedef struct crypto_digest_env_t crypto_digest_env_t;

typedef struct crypto_dh_env_t crypto_dh_env_t;



/* global state */

int crypto_global_init();

int crypto_global_cleanup();



/* environment setup */

crypto_pk_env_t *crypto_new_pk_env(int type);

crypto_pk_env_t *crypto_new_pk_env(void);

void crypto_free_pk_env(crypto_pk_env_t *env);



crypto_cipher_env_t *crypto_new_cipher_env(int type);

crypto_cipher_env_t *crypto_new_cipher_env(void);

void crypto_free_cipher_env(crypto_cipher_env_t *env);



/* public key crypto */
@@ -50,23 +47,22 @@ int crypto_pk_write_public_key_to_file(crypto_pk_env_t *env, FILE *dest); 
int crypto_pk_check_key(crypto_pk_env_t *env);

int crypto_pk_read_private_key_from_filename(crypto_pk_env_t *env, const char *keyfile);



int crypto_pk_set_key(crypto_pk_env_t *env, unsigned char *key);

int crypto_pk_cmp_keys(crypto_pk_env_t *a, crypto_pk_env_t *b);

crypto_pk_env_t *crypto_pk_dup_key(crypto_pk_env_t *orig);

int crypto_pk_keysize(crypto_pk_env_t *env);



int crypto_pk_public_encrypt(crypto_pk_env_t *env, unsigned char *from, int fromlen, unsigned char *to, int padding);

int crypto_pk_private_decrypt(crypto_pk_env_t *env, unsigned char *from, int fromlen, unsigned char *to, int padding);

int crypto_pk_private_sign(crypto_pk_env_t *env, unsigned char *from, int fromlen, unsigned char *to);

int crypto_pk_private_sign_digest(crypto_pk_env_t *env, unsigned char *from, int fromlen, unsigned char *to);

int crypto_pk_public_checksig(crypto_pk_env_t *env, unsigned char *from, int fromlen, unsigned char *to);

int crypto_pk_public_checksig_digest(crypto_pk_env_t *env, unsigned char *data, int datalen, unsigned char *sig, int siglen);

int crypto_pk_public_hybrid_encrypt(crypto_pk_env_t *env, unsigned char *from,

				    int fromlen, unsigned char *to,

				    int padding);

int crypto_pk_private_hybrid_decrypt(crypto_pk_env_t *env, unsigned char *from,

				    int fromlen, unsigned char *to,

				    int padding);

int crypto_pk_public_encrypt(crypto_pk_env_t *env, const unsigned char *from, int fromlen, unsigned char *to, int padding);

int crypto_pk_private_decrypt(crypto_pk_env_t *env, const unsigned char *from, int fromlen, unsigned char *to, int padding);

int crypto_pk_private_sign(crypto_pk_env_t *env, const unsigned char *from, int fromlen, unsigned char *to);

int crypto_pk_private_sign_digest(crypto_pk_env_t *env, const unsigned char *from, int fromlen, unsigned char *to);

int crypto_pk_public_checksig(crypto_pk_env_t *env, const unsigned char *from, int fromlen, unsigned char *to);

int crypto_pk_public_checksig_digest(crypto_pk_env_t *env, const unsigned char *data, int datalen, unsigned char *sig, int siglen);

int crypto_pk_public_hybrid_encrypt(crypto_pk_env_t *env,

                                    const unsigned char *from, int fromlen,

                                    unsigned char *to, int padding);

int crypto_pk_private_hybrid_decrypt(crypto_pk_env_t *env,

                                     const unsigned char *from, int fromlen,

                                     unsigned char *to,int padding);



#define FINGERPRINT_LEN 49

int crypto_pk_asn1_encode(crypto_pk_env_t *pk, char *dest, int dest_len);
@@ -81,43 +77,37 @@ int base64_decode(char *dest, int destlen, const char *src, int srclen); 
int base32_encode(char *dest, int destlen, const char *src, int srclen);



/* Key negotiation */

typedef struct crypto_dh_env_st {

  DH *dh;

} crypto_dh_env_t;



/* #define CRYPTO_DH_SIZE (1536 / 8) */

#define CRYPTO_DH_SIZE (1024 / 8)

crypto_dh_env_t *crypto_dh_new();

int crypto_dh_get_bytes(crypto_dh_env_t *dh);

int crypto_dh_generate_public(crypto_dh_env_t *dh);

int crypto_dh_get_public(crypto_dh_env_t *dh, char *pubkey_out,

                         int pubkey_out_len);

int crypto_dh_compute_secret(crypto_dh_env_t *dh,

                             char *pubkey, int pubkey_len,

                             const char *pubkey, int pubkey_len,

                             char *secret_out, int secret_out_len);

void crypto_dh_free(crypto_dh_env_t *dh);



/* symmetric crypto */

int crypto_cipher_generate_key(crypto_cipher_env_t *env);

int crypto_cipher_set_iv(crypto_cipher_env_t *env, unsigned char *iv);

int crypto_cipher_set_key(crypto_cipher_env_t *env, unsigned char *key);

int crypto_cipher_set_iv(crypto_cipher_env_t *env, const unsigned char *iv);

int crypto_cipher_set_key(crypto_cipher_env_t *env, const unsigned char *key);

int crypto_cipher_encrypt_init_cipher(crypto_cipher_env_t *env);

int crypto_cipher_decrypt_init_cipher(crypto_cipher_env_t *env);

unsigned char *crypto_cipher_get_key(crypto_cipher_env_t *env);

const unsigned char *crypto_cipher_get_key(crypto_cipher_env_t *env);



int crypto_cipher_encrypt(crypto_cipher_env_t *env, unsigned char *from, unsigned int fromlen, unsigned char *to);

int crypto_cipher_decrypt(crypto_cipher_env_t *env, unsigned char *from, unsigned int fromlen, unsigned char *to);

int crypto_cipher_encrypt(crypto_cipher_env_t *env, const unsigned char *from, unsigned int fromlen, unsigned char *to);

int crypto_cipher_decrypt(crypto_cipher_env_t *env, const unsigned char *from, unsigned int fromlen, unsigned char *to);



/* only implemented for CRYPTO_CIPHER_AES_CTR */

int crypto_cipher_rewind(crypto_cipher_env_t *env, long delta);

int crypto_cipher_advance(crypto_cipher_env_t *env, long delta);



/* convenience function: wraps crypto_create_crypto_env, set_key, set_iv, and init. */

crypto_cipher_env_t *crypto_create_init_cipher(int cipher_type, char *key, char *iv, int encrypt_mode);

crypto_cipher_env_t *crypto_create_init_cipher(const char *key, const char *iv, int encrypt_mode);



/* SHA-1 */

int crypto_SHA_digest(const unsigned char *m, int len, unsigned char *digest);

crypto_digest_env_t *crypto_new_digest_env(int type);

int crypto_digest(const unsigned char *m, int len, unsigned char *digest);

crypto_digest_env_t *crypto_new_digest_env();

void crypto_free_digest_env(crypto_digest_env_t *digest);

void crypto_digest_add_bytes(crypto_digest_env_t *digest, const char *data,

                             size_t len);
@@ -134,5 +124,13 @@ void crypto_pseudo_rand(unsigned int n, unsigned char *to); 
int crypto_pseudo_rand_int(unsigned int max);



/* errors */

char *crypto_perror();

const char *crypto_perror();

#endif



/*

  Local Variables:

  mode:c

  indent-tabs-mode:nil

  c-basic-offset:2

  End:

*/

src/common/log.c

+2 −0
Changes for src/common/log.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ 
/* $Id$ */



#include "../or/or.h"

#include <stdarg.h>



#ifdef MS_WINDOWS

#define vsnprintf _vsnprintf

#endif