[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r418 - GNUnet/src/util
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r418 - GNUnet/src/util |
|
Date: |
Tue, 8 Mar 2005 11:58:49 -0800 (PST) |
Author: grothoff
Date: 2005-03-08 11:58:47 -0800 (Tue, 08 Mar 2005)
New Revision: 418
Removed:
GNUnet/src/util/hostkey_openssl.c
GNUnet/src/util/random_openssl.c
GNUnet/src/util/symcipher_openssl.c
Log:
removing troublesome openssl
Deleted: GNUnet/src/util/hostkey_openssl.c
===================================================================
--- GNUnet/src/util/hostkey_openssl.c 2005-03-08 19:58:07 UTC (rev 417)
+++ GNUnet/src/util/hostkey_openssl.c 2005-03-08 19:58:47 UTC (rev 418)
@@ -1,524 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other
contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file util/hostkey_openssl.c
- * @brief public key cryptography (RSA) with OpenSSL
- * @author Christian Grothoff
- */
-
-#include "gnunet_util.h"
-#include "platform.h"
-#include <openssl/rsa.h>
-#include <openssl/evp.h>
-#include <openssl/bn.h>
-#include <openssl/err.h>
-
-struct PrivateKey {
- RSA * rsa;
-};
-
-#define HOSTKEY_LEN 2048
-#define EXTRA_CHECKS YES
-
-/**
- * This HostKey implementation uses RSA.
- */
-struct PrivateKey * makePrivateKey() {
- struct PrivateKey * ret;
- RSA * hk;
-
- hk = RSA_generate_key(HOSTKEY_LEN, 65535, NULL, 0);
- if (hk == NULL) {
- LOG(LOG_ERROR,
- _("'%s' failed at %s:%d with error: %s\n"),
- "RSA_generate_key",
- __FILE__, __LINE__,
- ERR_error_string(ERR_get_error(), NULL));
- return NULL;
- }
- ret = MALLOC(sizeof(struct PrivateKey));
- ret->rsa = hk;
- return ret;
-}
-
-/**
- * Free memory occupied by hostkey
- */
-void freePrivateKey(struct PrivateKey * hostkey) {
- RSA_free(hostkey->rsa);
- FREE(hostkey);
-}
-
-
-/**
- * Extract the public key of the host.
- * @param hostkey the hostkey to extract into the result.
- * @param result where to write the result.
- */
-void getPublicKey(const struct PrivateKey * hostkey,
- PublicKey * result) {
- unsigned short sizen;
- unsigned short sizee;
- unsigned short size;
-
- sizen = BN_num_bytes(hostkey->rsa->n);
- sizee = BN_num_bytes(hostkey->rsa->e);
- size = sizen + sizee+2*sizeof(unsigned short);
- GNUNET_ASSERT(size == sizeof(PublicKey)-sizeof(result->padding));
- GNUNET_ASSERT(RSA_KEY_LEN == sizen+sizee);
- result->len = htons(size);
- result->sizen = htons(sizen);
- result->padding = 0;
- if (sizen != BN_bn2bin(hostkey->rsa->n,
- &result->key[0]))
- errexit(_("Function '%s' did not return expected size %u: %s\n"),
- "BN_bn2bin(n)",
- sizen,
- ERR_error_string(ERR_get_error(), NULL));
- if (sizee != BN_bn2bin(hostkey->rsa->e,
- &result->key[sizen]))
- errexit(_("Function '%s' did not return expected size %u: %s\n"),
- "BN_bn2bin(e)",
- sizee,
- ERR_error_string(ERR_get_error(), NULL));
-}
-
-
-/**
- * Internal: publicKey => RSA-Key
- *
- * Note that this function returns a public key, despite
- * of what the type says.
- */
-static struct PrivateKey * public2PrivateKey(const PublicKey * publicKey) {
- struct PrivateKey * ret;
- RSA * result;
- int sizen;
- int sizee;
-
- if (ntohs(publicKey->len) != sizeof(PublicKey)-sizeof(publicKey->padding)) {
- BREAK();
- return NULL;
- }
- sizen = ntohs(publicKey->sizen);
- sizee = ntohs(publicKey->len) - sizen - 2*sizeof(unsigned short);
- if ( (sizen != RSA_ENC_LEN) ||
- (sizee + sizen != RSA_KEY_LEN)) {
- BREAK();
- return NULL;
- }
- result = RSA_new();
- result->n = BN_bin2bn(&publicKey->key[0],
- sizen,
- NULL);
- result->e = BN_bin2bn(&publicKey->key[sizen],
- sizee,
- NULL);
- ret = MALLOC(sizeof(struct PrivateKey));
- ret->rsa = result;
- return ret;
-}
-
-/**
- * Encode the private key in a format suitable for
- * storing it into a file.
- * @returns encoding of the private key.
- * The first 4 bytes give the size of the array, as usual.
- */
-PrivateKeyEncoded * encodePrivateKey(const struct PrivateKey * hostkey) {
- /*
- BIGNUM *n; public modulus
- BIGNUM *e; public exponent
- BIGNUM *d; private exponent
- BIGNUM *p; secret prime factor
- BIGNUM *q; secret prime factor
- BIGNUM *dmp1; d mod (p-1)
- BIGNUM *dmq1; d mod (q-1)
- BIGNUM *iqmp; q^-1 mod p
- */
- unsigned short sizen;
- unsigned short sizee;
- unsigned short sized;
- unsigned short sizep;
- unsigned short sizeq;
- unsigned short sizedmp1;
- unsigned short sizedmq1;
- unsigned short sizeiqmp;
- unsigned short size;
- PrivateKeyEncoded * retval;
-
- sizen = BN_num_bytes(hostkey->rsa->n);
- sizee = BN_num_bytes(hostkey->rsa->e);
- sized = BN_num_bytes(hostkey->rsa->d);
- if (hostkey->rsa->p != NULL)
- sizep = BN_num_bytes(hostkey->rsa->p);
- else
- sizep = 0;
- if (hostkey->rsa->q != NULL)
- sizeq = BN_num_bytes(hostkey->rsa->q);
- else
- sizeq = 0;
- if (hostkey->rsa->dmp1 != NULL)
- sizedmp1 = BN_num_bytes(hostkey->rsa->dmp1);
- else
- sizedmp1 = 0;
- if (hostkey->rsa->dmq1 != NULL)
- sizedmq1 = BN_num_bytes(hostkey->rsa->dmq1);
- else
- sizedmq1 = 0;
- if (hostkey->rsa->iqmp != NULL)
- sizeiqmp = BN_num_bytes(hostkey->rsa->iqmp);
- else
- sizeiqmp = 0;
- size =
sizen+sizee+sized+sizep+sizeq+sizedmp1+sizedmq1+sizeiqmp+sizeof(PrivateKeyEncoded);
- retval = (PrivateKeyEncoded *) MALLOC(size);
- retval->len = htons(size);
- retval->sizen = htons(sizen);
- retval->sizee = htons(sizee);
- retval->sized = htons(sized);
- retval->sizep = htons(sizep);
- retval->sizeq = htons(sizeq);
- retval->sizedmp1 = htons(sizedmp1);
- retval->sizedmq1 = htons(sizedmq1);
- BN_bn2bin(hostkey->rsa->n,
- &((char*)&retval[1])[0]);
- BN_bn2bin(hostkey->rsa->e,
- &((char*)&retval[1])[0+sizen]);
- BN_bn2bin(hostkey->rsa->d,
- &((char*)&retval[1])[0+sizen+sizee]);
- if (hostkey->rsa->p != NULL)
- BN_bn2bin(hostkey->rsa->p,
- &((char*)&retval[1])[0+sizen+sizee+sized]);
- if (hostkey->rsa->q != NULL)
- BN_bn2bin(hostkey->rsa->q,
- &((char*)&retval[1])[0+sizen+sizee+sized+
- sizep]);
- if (hostkey->rsa->dmp1 != NULL)
- BN_bn2bin(hostkey->rsa->dmp1,
- &((char*)&retval[1])[0+sizen+sizee+sized+
- sizep+sizeq]);
- if (hostkey->rsa->dmq1 != NULL)
- BN_bn2bin(hostkey->rsa->dmq1,
- &((char*)&retval[1])[0+sizen+sizee+sized+
- sizep+sizeq+sizedmp1]);
- if (hostkey->rsa->iqmp != NULL)
- BN_bn2bin(hostkey->rsa->iqmp,
- &((char*)&retval[1])[0+sizen+sizee+sized+
- sizep+sizeq+sizedmp1+sizedmq1]);
- return retval;
-}
-
-/**
- * Decode the private key from the file-format back
- * to the "normal", internal format.
- */
-struct PrivateKey * decodePrivateKey(const PrivateKeyEncoded * encoding) {
- unsigned short sizen;
- unsigned short sizee;
- unsigned short sized;
- unsigned short sizep;
- unsigned short sizeq;
- unsigned short sizedmp1;
- unsigned short sizedmq1;
- unsigned short size;
- unsigned short sum;
- RSA * result;
- struct PrivateKey * ret;
-
- result = RSA_new();
- size = ntohs(encoding->len) - sizeof(PrivateKeyEncoded);
- sizen = ntohs(encoding->sizen);
- sizee = ntohs(encoding->sizee);
- sized = ntohs(encoding->sized);
- sizep = ntohs(encoding->sizep);
- sizeq = ntohs(encoding->sizeq);
- sizedmp1= ntohs(encoding->sizedmp1);
- sizedmq1= ntohs(encoding->sizedmq1);
- sum = 0;
- result->n= BN_bin2bn(&((char*)&encoding[1])[sum],
- sizen,
- NULL);
- sum += sizen;
- result->e= BN_bin2bn(&((char*)&encoding[1])[sum],
- sizee,
- NULL);
- sum += sizee;
- result->d= BN_bin2bn(&((char*)&encoding[1])[sum],
- sized,
- NULL);
- sum += sized;
- if (sizep != 0) {
- result->p = BN_bin2bn(&((char*)&encoding[1])[sum],
- sizep, NULL);
- sum += sizep;
- } else
- result->p = NULL;
- if (sizeq != 0) {
- result->q = BN_bin2bn(&((char*)&encoding[1])[sum],
- sizeq,
- NULL);
- sum += sizeq;
- } else
- result->q = NULL;
- if (sizedmp1 != 0) {
- result->dmp1= BN_bin2bn(&((char*)&encoding[1])[sum],
- sizedmp1,
- NULL);
- sum += sizedmp1;
- } else
- result->dmp1 = NULL;
- if (sizedmq1 != 0) {
- result->dmq1 = BN_bin2bn(&((char*)&encoding[1])[sum],
- sizedmq1,
- NULL);
- sum += sizedmq1;
- } else
- result->dmq1 = NULL;
- if (size - sum > 0)
- result->iqmp= BN_bin2bn(&((char*)&encoding[1])[sum],
- size-sum,
- NULL);
- else
- result->iqmp = NULL;
- ret = MALLOC(sizeof(struct PrivateKey));
- ret->rsa = result;
- return ret;
-}
-
-/**
- * Encrypt a block with the public key of another host that uses the
- * same cyper.
- *
- * @param block the block to encrypt
- * @param size the size of block
- * @param publicKey the encoded public key used to encrypt
- * @param target where to store the encrypted block
- * @returns SYSERR on error, OK if ok
- */
-int encryptPrivateKey(const void * block,
- unsigned short size,
- const PublicKey * publicKey,
- RSAEncryptedData * target) {
- struct PrivateKey * foreignkey;
- int rs;
- int len;
-
- foreignkey = public2PrivateKey(publicKey);
- if (foreignkey == NULL)
- return SYSERR;
- rs = RSA_size(foreignkey->rsa);
- /* now encrypt. First get size of the block */
- if (size > (rs - 41)) {
- BREAK();
- freePrivateKey(foreignkey);
- return SYSERR;
- }
- if (rs != sizeof(RSAEncryptedData)) {
- BREAK();
- freePrivateKey(foreignkey);
- return SYSERR;
- }
- len = RSA_public_encrypt(size,
- (void*)block, /* cast for old OpenSSL versions */
- &target->encoding[0],
- foreignkey->rsa,
- RSA_PKCS1_PADDING);
- if (len != RSA_ENC_LEN) {
- if (len == -1)
- LOG(LOG_ERROR,
- _("'%s' failed at %s:%d with error: %s\n"),
- "RSA_public_encrypt",
- __FILE__, __LINE__,
- ERR_error_string(ERR_get_error(), NULL));
- else
- LOG(LOG_ERROR,
- _("RSA-Encoding has unexpected length %d (expected %d)!"),
- len,
- RSA_ENC_LEN);
- freePrivateKey(foreignkey);
- return SYSERR;
- }
- freePrivateKey(foreignkey);
- return OK;
-}
-
-/**
- * Decrypt a given block with the hostkey.
- *
- * @param hostkey the hostkey with which to decrypt this block
- * @param block the data to decrypt, encoded as returned by encrypt
- * @param result pointer to a location where the result can be stored
- * @param max the maximum number of bits to store for the result, if
- * the decrypted block is bigger, an error is returned
- * @returns the size of the decrypted block, -1 on error
- */
-int decryptPrivateKey(const struct PrivateKey * hostkey,
- const RSAEncryptedData * block,
- void * result,
- unsigned short max) {
- RSAEncryptedData tmp; /* this is as big as the result can possibly get */
- int size;
-
- if (block == NULL)
- return -1;
-
- size = RSA_private_decrypt(sizeof(RSAEncryptedData),
- (void*)&block->encoding[0], /* cast for old
OpenSSL versions */
- &tmp.encoding[0],
- hostkey->rsa,
- RSA_PKCS1_PADDING);
- if ( (size == -1) ||
- (size > max) ) {
- ERR_load_crypto_strings();
- LOG(LOG_WARNING,
- _("'%s' failed at %s:%d with error: %s\n"),
- "RSA_private_decrypt",
- __FILE__, __LINE__,
- ERR_error_string(ERR_get_error(), NULL));
- ERR_free_strings();
- return -1;
- }
- memcpy(result,
- &tmp.encoding[0],
- size);
- return size;
-}
-
-/**
- * Sign a given block.
- *
- * @param hostkey the hostkey with which to sign this block
- * @param size how many bytes to sign
- * @param block the data to sign
- * @param sig where to write the signature
- * @return SYSERR on error, OK on success
- */
-int sign(const struct PrivateKey * hostkey,
- unsigned short size,
- const void * block,
- Signature * sig) {
-#if EXTRA_CHECKS
- PublicKey pkey;
-#endif
- int rs = RSA_size(hostkey->rsa);
- unsigned int sigSize;
- HashCode512 hc;
-
- if (block == NULL)
- return SYSERR;
- if (rs != sizeof(Signature)) {
- BREAK();
- return SYSERR;
- }
- hash(block,
- size,
- &hc);
- if (1 != RSA_sign(NID_undef,
- (unsigned char*)&hc,
- sizeof(HashCode512),
- &sig->sig[0],
- &sigSize,
- hostkey->rsa)) {
- LOG(LOG_ERROR,
- _("'%s' failed at %s:%d with error: %s\n"),
- "RSA_sign",
- __FILE__, __LINE__,
- ERR_error_string(ERR_get_error(), NULL));
- return SYSERR;
- }
- if (sigSize != sizeof(Signature)) {
- BREAK();
- return SYSERR;
- }
-#if EXTRA_CHECKS
- if (1 != RSA_verify(NID_ripemd160,
- (unsigned char*)&hc,
- sizeof(HashCode512),
- &sig->sig[0],
- sizeof(Signature),
- hostkey->rsa))
- BREAK();
-
- getPublicKey(hostkey, &pkey);
- if (SYSERR == verifySig(block, size, sig, &pkey)) {
- BREAK();
- if (1 != RSA_verify(NID_ripemd160,
- (unsigned char*)&hc,
- sizeof(HashCode512),
- &sig->sig[0],
- sizeof(Signature),
- hostkey->rsa))
- BREAK();
- return SYSERR;
- }
-#endif
- return OK;
-}
-
-/**
- * Verify signature.
- *
- * @param block the signed data
- * @param len the length of the block
- * @param sig signature
- * @param publicKey public key of the signer
- * @returns OK if ok, SYSERR if invalid
- */
-int verifySig(const void * block,
- unsigned short len,
- const Signature * sig,
- const PublicKey * publicKey) {
- struct PrivateKey * hostkey;
- int rs;
- HashCode512 hc;
-
- hostkey = public2PrivateKey(publicKey);
- if ( (hostkey == NULL) ||
- (sig == NULL) ||
- (block == NULL))
- return SYSERR; /* hey, no data !? */
- rs = RSA_size(hostkey->rsa);
- if (rs != RSA_ENC_LEN) {
- BREAK();
- return SYSERR;
- }
- hash(block,
- len,
- &hc);
- if (1 != RSA_verify(NID_ripemd160,
- (unsigned char*)&hc,
- sizeof(HashCode512),
- (unsigned char*) &sig->sig[0], /* cast because OpenSSL
may not declare const */
- sizeof(Signature),
- hostkey->rsa)) {
- LOG(LOG_INFO,
- _("RSA signature verification failed at %s:%d: %s\n"),
- __FILE__, __LINE__,
- ERR_error_string(ERR_get_error(), NULL));
- freePrivateKey(hostkey);
- return SYSERR;
- }
- freePrivateKey(hostkey);
- return OK;
-}
-
-
-/* end of hostkey_openssl.c */
Deleted: GNUnet/src/util/random_openssl.c
===================================================================
--- GNUnet/src/util/random_openssl.c 2005-03-08 19:58:07 UTC (rev 417)
+++ GNUnet/src/util/random_openssl.c 2005-03-08 19:58:47 UTC (rev 418)
@@ -1,87 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2001, 2002, 2003, 2004 Christian Grothoff (and other contributing
authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-
-*/
-
-/**
- * @file util/random_openssl.c
- * @brief functions to gather random numbers
- * @author Christian Grothoff
- */
-#include "platform.h"
-#include "gnunet_util.h"
-#include <openssl/rand.h>
-
-/**
- * Initialize Random number generator.
- */
-void initRAND() {
- srand((unsigned int)time(NULL));
- RAND_set_rand_method(RAND_SSLeay());
-}
-
-/**
- * @return a random value in the interval [0,i[.
- */
-unsigned int randomi(unsigned int i) {
- unsigned int ret;
-
- GNUNET_ASSERT(i > 0);
- if (1 != RAND_bytes((unsigned char*)&ret, sizeof(unsigned int)))
- ret = rand(); /* in case RAND_bytes fails, we got at least something! */
- ret = ret % i;
- GNUNET_ASSERT((ret >= 0) && (ret < i));
- return ret;
-}
-
-/**
- * Get an array with a random permutation of the numbers 0...n-1.
- */
-int * permute(int n) {
- int * ret;
- int i;
- int tmp;
- int x;
-
- GNUNET_ASSERT(n > 0);
- ret = (int*)MALLOC(n * sizeof(int));
- for (i=0;i<n;i++)
- ret[i] = i;
- for (i=0;i<n;i++) {
- x = randomi(n);
- tmp = ret[x];
- ret[x] = ret[i];
- ret[i] = tmp;
- }
- return ret;
-}
-
-/**
- * Random on unsigned 64-bit values. We break them down into signed
- * 32-bit values and reassemble the 64-bit random value bit-wise.
- */
-unsigned long long randomi64(unsigned long long u) {
- unsigned long long ret;
-
- ret = ((unsigned long long)rand()) << 32 | rand(); /* in case RAND_bytes
fails, we got at least something! */
- RAND_bytes((unsigned char*)&ret,
- sizeof(unsigned long long));
- return ret % u;
-}
-
Deleted: GNUnet/src/util/symcipher_openssl.c
===================================================================
--- GNUnet/src/util/symcipher_openssl.c 2005-03-08 19:58:07 UTC (rev 417)
+++ GNUnet/src/util/symcipher_openssl.c 2005-03-08 19:58:47 UTC (rev 418)
@@ -1,175 +0,0 @@
-/*
- This file is part of GNUnet.
- (C) 2001, 2002, 2004, 2005 Christian Grothoff (and other contributing
authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file util/symcipher_openssl.c
- * @brief Symetric encryption services.
- * @author Christian Grothoff
- * @author Ioana Patrascu
- */
-
-#include "gnunet_util.h"
-#include "platform.h"
-#include <openssl/aes.h>
-#include <openssl/evp.h>
-#include <openssl/bn.h>
-#include <openssl/err.h>
-#include <openssl/rand.h>
-
-/**
- * Create a new SessionKey (for Blowfish)
- */
-void makeSessionkey(SESSIONKEY * key) {
- int i;
- if (1 != RAND_bytes(&key->key[0],
- SESSIONKEY_LEN)) {
- for (i=0;i<SESSIONKEY_LEN;i++)
- key->key[i] = rand();
- }
- key->crc32 = htonl(crc32N(key, SESSIONKEY_LEN));
-}
-
-/**
- * Encrypt a block with the public key of another
- * host that uses the same cyper.
- * @param block the block to encrypt
- * @param len the size of the block
- * @param sessionkey the key used to encrypt
- * @param iv the initialization vector to use, use INITVALUE
- * for streams.
- * @param result the output parameter in which to store the encrypted result
- * @returns the size of the encrypted block, -1 for errors
- */
-int encryptBlock(const void * block,
- unsigned short len,
- const SESSIONKEY * sessionkey,
- const INITVECTOR * iv,
- void * result) {
- int outlen = 0;
- EVP_CIPHER_CTX ctx;
-
- if (sessionkey->crc32 !=
- htonl(crc32N(sessionkey, SESSIONKEY_LEN))) {
- BREAK();
- return SYSERR;
- }
- GNUNET_ASSERT( (block != NULL) && (sessionkey != NULL) );
- /* compute result size by adding block-length, always padded */
- EVP_EncryptInit(&ctx,
- EVP_aes_256_cfb(),
- (void*) sessionkey->key, /* cast for old OpenSSL versions */
- (void*) iv); /* cast for old OpenSSL versions */
-#if SSL_MICRO >= 6
- if (0 == EVP_EncryptUpdate(&ctx,
- result,
- &outlen,
- block, len)) {
- BREAK();
- return -1;
- }
-#else
- EVP_EncryptUpdate(&ctx,
- result,
- &outlen,
- (void*) block, /* cast for old OpenSSL versions */
- len);
-#endif
- len = outlen; /* save bytes written so far */
- outlen = 0;
-#if SSL_MICRO >= 6
- if (0 == EVP_EncryptFinal(&ctx,
- &((unsigned char*)result)[len],
- &outlen)) {
- BREAK();
- return -1;
- }
-#else
- EVP_EncryptFinal(&ctx,
- &((unsigned char*)result)[len],
- &outlen);
-#endif
- outlen += len; /* add both updates together */
- EVP_CIPHER_CTX_cleanup(&ctx);
- return outlen;
-}
-
-/**
- * Decrypt a given block with the sessionkey.
- * @param sessionkey the key used to decrypt
- * @param block the data to decrypt, encoded as returned by encrypt
- * @param size the size of the block to decrypt
- * @param iv the initialization vector to use, use INITVALUE
- * for streams.
- * @param result address to store the result at
- * @return -1 on failure, size of decrypted block on success
- */
-int decryptBlock(const SESSIONKEY * sessionkey,
- const void * block,
- unsigned short size,
- const INITVECTOR * iv,
- void * result) {
- int outlen = 0;
- EVP_CIPHER_CTX ctx;
-
- if (sessionkey->crc32 !=
- htonl(crc32N(sessionkey, SESSIONKEY_LEN))) {
- BREAK();
- return SYSERR;
- }
- /* use aes-256-cfb */
- EVP_DecryptInit(&ctx,
- EVP_aes_256_cfb(),
- (void*)sessionkey->key, /* cast for old OpenSSL versions */
- (void*)iv); /* cast for old OpenSSL versions */
-#if SSL_MICRO >= 6
- if (0 == EVP_DecryptUpdate(&ctx,
- result,
- &outlen,
- (void*) block, /* cast for old OpenSSL versions */
- size)) {
- BREAK();
- return -1;
- }
-#else
- EVP_DecryptUpdate(&ctx,
- result,
- &outlen,
- (void*) block, /* cast for old OpenSSL versions */
- size);
-#endif
- size = outlen;
- outlen = 0;
-#if SSL_MICRO >= 6
- if (0 == EVP_DecryptFinal(&ctx,
- &((unsigned char*)result)[size],
- &outlen)) {
- BREAK();
- return -1;
- }
-#else
- EVP_DecryptFinal(&ctx,
- &((unsigned char*)result)[size],
- &outlen);
-#endif
- EVP_CIPHER_CTX_cleanup(&ctx);
- return size+outlen;
-}
-
-/* end of symcipher_openssl.c */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r418 - GNUnet/src/util,
grothoff <=