diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2001-06-24 08:45:22 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2001-06-24 08:45:22 +0000 |
| commit | a863e462ece7b4b07655121c0cbaba7d638acf05 (patch) | |
| tree | f2dac4ebe8f04993547a1402ce7bdcb3895672df /lib/gnutls_cipher_int.c | |
| parent | a7e685e4b201143f7d2d2790aec39e0f6745905d (diff) | |
| download | gnutls-a863e462ece7b4b07655121c0cbaba7d638acf05.tar.gz | |
several cleanups
Diffstat (limited to 'lib/gnutls_cipher_int.c')
| -rw-r--r-- | lib/gnutls_cipher_int.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/gnutls_cipher_int.c b/lib/gnutls_cipher_int.c index 97d3600bc0..dbd644b7fb 100644 --- a/lib/gnutls_cipher_int.c +++ b/lib/gnutls_cipher_int.c @@ -22,8 +22,9 @@ #include <gnutls_int.h> #include <gnutls_errors.h> #include <gnutls_cipher_int.h> +#include <gnutls_datum.h> -GNUTLS_CIPHER_HANDLE gnutls_cipher_init( BulkCipherAlgorithm cipher, void* key, int keysize, void* iv, int ivsize) +GNUTLS_CIPHER_HANDLE gnutls_cipher_init( BulkCipherAlgorithm cipher, gnutls_datum key, gnutls_datum iv) { GNUTLS_CIPHER_HANDLE ret; @@ -72,12 +73,12 @@ GNUTLS_CIPHER_HANDLE ret; if (ret!=GNUTLS_CIPHER_FAILED) { #ifdef USE_MCRYPT /* ivsize is assumed to be blocksize */ - if ( mcrypt_generic_init( ret, key, keysize, iv) < 0) { + if ( mcrypt_generic_init( ret, key.data, key.size, iv.data) < 0) { return GNUTLS_CIPHER_FAILED; }; #else - gcry_cipher_setkey(ret, key, keysize); - if (iv!=NULL && ivsize>0) gcry_cipher_setiv(ret, iv, ivsize); + gcry_cipher_setkey(ret, key.data, key.size); + if (iv!=NULL && ivsize>0) gcry_cipher_setiv(ret, iv.data, iv.size); #endif } |