1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00

Changes for MingW32/CPD 0.3 and some bug fixes

This commit is contained in:
Werner Koch 2001-01-18 09:02:35 +00:00
parent 90ddf482d0
commit 227d0f17de
16 changed files with 150 additions and 72 deletions

View file

@ -1,3 +1,12 @@
2001-01-18 Werner Koch <wk@gnupg.org>
* rndw32.c: Fixed typo and wrong ifdef for VER_PLATFORM* macro
2001-01-12 Werner Koch <wk@gnupg.org>
* cipher.c (cipher_encrypt,cipher_encrypt): Use blocksize and
not 8 for CBC mode (However: we don't use CBS in OpenPGP).
2000-11-22 Werner Koch <wk@gnupg.org>
* rndegd.c (gather_random): Fixed default socket to be '=entropy'.

View file

@ -619,12 +619,12 @@ cipher_encrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
{
switch( c->mode ) {
case 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 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 CIPHER_MODE_CFB:
case CIPHER_MODE_PHILS_CFB:
@ -649,12 +649,12 @@ cipher_decrypt( CIPHER_HANDLE c, byte *outbuf, byte *inbuf, unsigned nbytes )
{
switch( c->mode ) {
case 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 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 CIPHER_MODE_CFB:
case CIPHER_MODE_PHILS_CFB:

View file

@ -311,8 +311,8 @@ gather_random_fast( void (*add)(const void*, size_t, int), int requester )
#ifndef IOCTL_DISK_PERFORMANCE
#define IOCTL_DISK_PERFORMANCE 0x00070020
#endif
#ifndef IOCTL_DISK_PERFORMANCE
#define VER_PLATFORM_WIN32_WINDOWSw 1
#ifndef VER_PLATFORM_WIN32_WINDOWS
#define VER_PLATFORM_WIN32_WINDOWS 1
#endif
typedef struct {