security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-26 22:29:58 +01:00
Code Activity

* idea-stub.c (load_module, idea_get_info): Return the proper type for

Browse Source 
idea_get_info from inside load_module.  From Stefan Bellon.
This commit is contained in:
David Shaw 2003-12-30 01:37:52 +00:00
parent d7a28c72a8
commit 8f7b94789c
2 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cipher/ChangeLog
View File

@ -1,5 +1,8 @@
2003-12-29 David Shaw <dshaw@jabberwocky.com> 2003-12-29 David Shaw <dshaw@jabberwocky.com>
* idea-stub.c (load_module, idea_get_info): Return the proper type
for idea_get_info from inside load_module. From Stefan Bellon.
* rijndael.c, rndunix.c, twofish.c: Remove dead IS_MODULE code. * rijndael.c, rndunix.c, twofish.c: Remove dead IS_MODULE code.
* g10c.c: Dead code. Remove. * g10c.c: Dead code. Remove.

27
cipher/idea-stub.c
View File

@ -1,5 +1,5 @@
/* idea-stub.c - Dummy module for the deprecated IDEA cipher. /* idea-stub.c - Dummy module for the deprecated IDEA cipher.
* Copyright (C) 2002, 2003 Free Software Foundation, Inc. * Copyright (C) 2002, 2003 Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -51,7 +51,6 @@
#define RTLD_NOW 1 #define RTLD_NOW 1
#endif #endif
#ifdef _WIN32 #ifdef _WIN32
#define HAVE_DL_DLOPEN #define HAVE_DL_DLOPEN
#define USE_DYNAMIC_LINKING #define USE_DYNAMIC_LINKING
@ -108,8 +107,13 @@ dlsym ( void *handle, const char *name )
#undef USE_DYNAMIC_LINKING #undef USE_DYNAMIC_LINKING
#endif #endif
typedef
const char *(*INFO_FNC)(int, size_t*, size_t*, size_t*,
int (**)( void *, byte *, unsigned),
void (**)( void *, byte *, byte *),
void (**)( void *, byte *, byte *));
static void * static INFO_FNC
load_module (const char *name) load_module (const char *name)
{ {
#ifdef USE_DYNAMIC_LINKING #ifdef USE_DYNAMIC_LINKING
@ -146,14 +150,6 @@ load_module (const char *name)
return NULL; return NULL;
} }
#ifdef __riscos__
typedef
const char *(*INFO_CAST)(int, size_t*, size_t*, size_t*,
int (**)( void *, byte *, unsigned),
void (**)( void *, byte *, byte *),
void (**)( void *, byte *, byte *));
#endif /* __riscos__ */
const char * const char *
idea_get_info( int algo, size_t *keylen, idea_get_info( int algo, size_t *keylen,
size_t *blocksize, size_t *contextsize, size_t *blocksize, size_t *contextsize,
@ -163,10 +159,7 @@ idea_get_info( int algo, size_t *keylen,
) )
{ {
static int initialized; static int initialized;
static const char * (*info_fnc)(int, size_t*, size_t*, size_t*, static INFO_FNC info_fnc;
int (**)( void *, byte *, unsigned),
void (**)( void *, byte *, byte *),
void (**)( void *, byte *, byte *));
const char *rstr; const char *rstr;
int i; int i;
@ -175,11 +168,7 @@ idea_get_info( int algo, size_t *keylen,
initialized = 1; initialized = 1;
for (i=0; (rstr = dynload_enum_module_names (i)); i++) for (i=0; (rstr = dynload_enum_module_names (i)); i++)
{ {
#ifndef __riscos__
info_fnc = load_module (rstr); info_fnc = load_module (rstr);
#else /* __riscos__ */
info_fnc = (INFO_CAST) load_module (rstr);
#endif /* __riscos__ */
if (info_fnc) if (info_fnc)
break; break;
} }