diff options
| author | Werner Koch <wk@gnupg.org> | 2001-01-11 10:38:08 +0000 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2001-01-11 10:38:08 +0000 |
| commit | 0eecba659555d50cd7bdd26daef9a32334759dc4 (patch) | |
| tree | b56337b8a159895c83fe929e46e1354df0f32048 | |
| parent | aeb8871bb0ad19e17d488a4394fab886cdf3762c (diff) | |
| download | libgcrypt-0eecba659555d50cd7bdd26daef9a32334759dc4.tar.gz | |
CBC mode fixes for AES
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | cipher/ChangeLog | 5 | ||||
| -rw-r--r-- | cipher/cipher.c | 16 | ||||
| -rw-r--r-- | mpi/ChangeLog | 4 | ||||
| -rw-r--r-- | mpi/Makefile.am | 4 | ||||
| -rw-r--r-- | scripts/distfiles | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 3 |
8 files changed, 25 insertions, 16 deletions
diff --git a/Makefile.am b/Makefile.am index 0ce05c93..80672089 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,9 +18,6 @@ dist-hook: done ; \ done @set -e; \ - sed -e 's/@pkg_version@/$(VERSION)/g' \ - $(top_srcdir)/scripts/gnupg.spec.in \ - > $(distdir)/scripts/gnupg.spec ; \ echo "$(VERSION)" > $(distdir)/VERSION diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 23ff5995..daaaf1ab 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,8 @@ +2001-01-11 Werner Koch <wk@gnupg.org> + + * cipher.c (cipher_encrypt,gcry_cipher_encrypt): Use blocksize and + not 8. + 2000-12-19 Werner Koch <wk@gnupg.org> Major change: diff --git a/cipher/cipher.c b/cipher/cipher.c index f0a2e5d6..b3796733 100644 --- a/cipher/cipher.c +++ b/cipher/cipher.c @@ -707,12 +707,12 @@ cipher_encrypt( GCRY_CIPHER_HD c, byte *outbuf, { switch( c->mode ) { case GCRY_CIPHER_MODE_ECB: - assert(!(nbytes%8)); - do_ecb_encrypt(c, outbuf, inbuf, nbytes/8 ); + assert(!(nbytes%c->blocksize)); + do_ecb_encrypt(c, outbuf, inbuf, nbytes/c->blocksize ); break; case GCRY_CIPHER_MODE_CBC: - assert(!(nbytes%8)); /* fixme: should be blocksize */ - do_cbc_encrypt(c, outbuf, inbuf, nbytes/8 ); + assert(!(nbytes%c->blocksize)); + do_cbc_encrypt(c, outbuf, inbuf, nbytes/c->blocksize ); break; case GCRY_CIPHER_MODE_CFB: do_cfb_encrypt(c, outbuf, inbuf, nbytes ); @@ -768,12 +768,12 @@ cipher_decrypt( GCRY_CIPHER_HD c, byte *outbuf, const byte *inbuf, { switch( c->mode ) { case GCRY_CIPHER_MODE_ECB: - assert(!(nbytes%8)); - do_ecb_decrypt(c, outbuf, inbuf, nbytes/8 ); + assert(!(nbytes%c->blocksize)); + do_ecb_decrypt(c, outbuf, inbuf, nbytes/c->blocksize ); break; case GCRY_CIPHER_MODE_CBC: - assert(!(nbytes%8)); /* fixme: should assert on blocksize */ - do_cbc_decrypt(c, outbuf, inbuf, nbytes/8 ); + assert(!(nbytes%c->blocksize)); + do_cbc_decrypt(c, outbuf, inbuf, nbytes/c->blocksize ); break; case GCRY_CIPHER_MODE_CFB: do_cfb_decrypt(c, outbuf, inbuf, nbytes ); diff --git a/mpi/ChangeLog b/mpi/ChangeLog index e41f1144..c1a10811 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,7 @@ +2001-01-11 Werner Koch <wk@gnupg.org> + + * Makefile.am: Removed mpi.h. + 2000-12-19 Werner Koch <wk@gnupg.org> * mpi-internal.h: Put limb_t definition in an ifdef. diff --git a/mpi/Makefile.am b/mpi/Makefile.am index 25041e87..35120063 100644 --- a/mpi/Makefile.am +++ b/mpi/Makefile.am @@ -34,8 +34,8 @@ libmpi_la_SOURCES = longlong.h \ mpih-cmp.c \ mpih-div.c \ mpih-mul.c \ - mpiutil.c \ - mpi.h + mpiutil.c + # Note this objects are actually links, the sourcefiles are # distributed by special code in dist-hook diff --git a/scripts/distfiles b/scripts/distfiles index 7262866b..56cf2172 100644 --- a/scripts/distfiles +++ b/scripts/distfiles @@ -2,9 +2,7 @@ config.guess config.sub install-sh mkinstalldirs -mkdiff missing -gnupg.spec.in autogen.sh ChangeLog ltconfig diff --git a/src/ChangeLog b/src/ChangeLog index f1dbe4f5..37e402a6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2001-01-11 Werner Koch <wk@gnupg.org> + + * Makefile.am (libgcrypt_la_SOURCES): Add mpi.h + 2000-12-19 Werner Koch <wk@gnupg.org> * types.h: Moved from ../include to here. diff --git a/src/Makefile.am b/src/Makefile.am index 72178305..9febd7a8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,7 +48,8 @@ libgcrypt_la_SOURCES = g10lib.h \ stdmem.c \ stdmem.h \ secmem.c \ - secmem.h + secmem.h \ + mpi.h libgcrypt_la_DEPENDENCIES = libgcrypt.sym \ ../cipher/libcipher.la ../mpi/libmpi.la |