Mercurial > dropbear
diff libtomcrypt/src/modes/cfb/cfb_getiv.c @ 435:337c45621e81
merge of 'a9b0496634cdd25647b65e585cc3240f3fa699ee'
and 'c22be8b8f570b48e9662dac32c7b3e7148a42206'
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Thu, 22 Feb 2007 14:53:49 +0000 |
| parents | 0cbe8f6dbf9e |
| children | f849a5ca2efc |
line wrap: on
line diff
--- a/libtomcrypt/src/modes/cfb/cfb_getiv.c Thu Feb 22 14:52:46 2007 +0000 +++ b/libtomcrypt/src/modes/cfb/cfb_getiv.c Thu Feb 22 14:53:49 2007 +0000 @@ -6,7 +6,7 @@ * The library is free for all purposes without any express * guarantee it works. * - * Tom St Denis, [email protected], http://libtomcrypt.org + * Tom St Denis, [email protected], http://libtomcrypt.com */ #include "tomcrypt.h" @@ -15,7 +15,7 @@ CFB implementation, get IV, Tom St Denis */ -#ifdef CFB +#ifdef LTC_CFB_MODE /** Get the current initial vector @@ -30,6 +30,7 @@ LTC_ARGCHK(len != NULL); LTC_ARGCHK(cfb != NULL); if ((unsigned long)cfb->blocklen > *len) { + *len = cfb->blocklen; return CRYPT_BUFFER_OVERFLOW; } XMEMCPY(IV, cfb->IV, cfb->blocklen); @@ -41,5 +42,5 @@ #endif /* $Source: /cvs/libtom/libtomcrypt/src/modes/cfb/cfb_getiv.c,v $ */ -/* $Revision: 1.3 $ */ -/* $Date: 2005/05/05 14:35:59 $ */ +/* $Revision: 1.6 $ */ +/* $Date: 2006/06/29 01:51:34 $ */