OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Dr.
Stephen Henson
Root: /v/openssl/cvs Email: steve openssl.org
Module: openssl Date:
09-Jul-2006 02:53:45
Branch: HEAD Handle:
2006070901534203
Modified files:
openssl CHANGES
openssl/apps openssl.c progs.h progs.pl
openssl/crypto/evp evp.h names.c
openssl/crypto/lhash lhash.c
Log:
New functions to enumerate digests and ciphers.
Summary:
Revision Changes Path
1.1337 +6 -0 openssl/CHANGES
1.61 +55 -0 openssl/apps/openssl.c
1.42 +2 -0 openssl/apps/progs.h
1.21 +2 -0 openssl/apps/progs.pl
1.164 +10 -0 openssl/crypto/evp/evp.h
1.10 +69 -0 openssl/crypto/evp/names.c
1.28 +3 -0 openssl/crypto/lhash/lhash.c
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/CHANGES
============================================================
================
$ cvs diff -u -r1.1336 -r1.1337 CHANGES
--- openssl/CHANGES 28 Jun 2006 14:50:11 -0000 1.1336
+++ openssl/CHANGES 9 Jul 2006 00:53:42 -0000 1.1337
-4,6 +4,12
Changes between 0.9.8b and 0.9.9 [xx XXX xxxx]
+ *) New functions EVP_CIPHER_do_all(),
EVP_CIPHER_do_all_sorted(),
+ EVP_MD_do_all() and EVP_MD_do_all_sorted() to
enumerate internal
+ digest and cipher tables. New options added to
openssl utility:
+ list-message-digest-algorithms and
list-cipher-algorithms.
+ [Steve Henson]
+
*) In addition to the numerical (unsigned long) thread
ID, provide
for a pointer (void *) thread ID. This helps
accomodate systems
that do not provide an unsigned long thread ID.
OpenSSL assumes
.
patch -p0 <<' .'
Index: openssl/apps/openssl.c
============================================================
================
$ cvs diff -u -r1.60 -r1.61 openssl.c
--- openssl/apps/openssl.c 9 Jun 2006 15:44:27 -0000 1.60
+++ openssl/apps/openssl.c 9 Jul 2006 00:53:43 -0000 1.61
-142,6 +142,8
static LHASH *prog_init(void );
static int do_cmd(LHASH *prog,int argc,char *argv[]);
static void list_pkey(BIO *out);
+static void list_cipher(BIO *out);
+static void list_md(BIO *out);
char *default_config_file=NULL;
/* Make sure there is only one when MONOLITH is defined
*/
-367,9 +369,12
#define LIST_STANDARD_COMMANDS
"list-standard-commands"
#define LIST_MESSAGE_DIGEST_COMMANDS
"list-message-digest-commands"
+#define LIST_MESSAGE_DIGEST_ALGORITHMS
"list-message-digest-algorithms"
#define LIST_CIPHER_COMMANDS
"list-cipher-commands"
+#define LIST_CIPHER_ALGORITHMS
"list-cipher-algorithms"
#define LIST_PUBLIC_KEY_ALGORITHMS
"list-public-key-algorithms"
+
static int do_cmd(LHASH *prog, int argc, char *argv[])
{
FUNCTION f,*fp;
-411,7 +416,9
}
else if ((strcmp(argv[0],LIST_STANDARD_COMMANDS) == 0)
||
(strcmp(argv[0],LIST_MESSAGE_DIGEST_COMMANDS) == 0) ||
+ (strcmp(argv[0],LIST_MESSAGE_DIGEST_ALGORITHMS) == 0)
||
(strcmp(argv[0],LIST_CIPHER_COMMANDS) == 0) ||
+ (strcmp(argv[0],LIST_CIPHER_ALGORITHMS) == 0) ||
(strcmp(argv[0],LIST_PUBLIC_KEY_ALGORITHMS) == 0))
{
int list_type;
-421,8 +428,12
list_type = FUNC_TYPE_GENERAL;
else if (strcmp(argv[0],LIST_MESSAGE_DIGEST_COMMANDS)
== 0)
list_type = FUNC_TYPE_MD;
+ else if (strcmp(argv[0],LIST_MESSAGE_DIGEST_ALGORITHMS)
== 0)
+ list_type = FUNC_TYPE_MD_ALG;
else if (strcmp(argv[0],LIST_PUBLIC_KEY_ALGORITHMS) ==
0)
list_type = FUNC_TYPE_PKEY;
+ else if (strcmp(argv[0],LIST_CIPHER_ALGORITHMS) == 0)
+ list_type = FUNC_TYPE_CIPHER_ALG;
else /* strcmp(argv[0],LIST_CIPHER_COMMANDS) == 0 */
list_type = FUNC_TYPE_CIPHER;
bio_stdout = BIO_new_fp(stdout,BIO_NOCLOSE);
-438,6 +449,10
if (list_type == FUNC_TYPE_PKEY)
list_pkey(bio_stdout);
+ if (list_type == FUNC_TYPE_MD_ALG)
+ list_md(bio_stdout);
+ if (list_type == FUNC_TYPE_CIPHER_ALG)
+ list_cipher(bio_stdout);
else
{
for (fp=functions; fp->name != NULL; fp++)
-540,6 +555,46
}
}
+static void list_cipher_fn(const EVP_CIPHER *c,
+ const char *from, const char *to, void *arg)
+ {
+ if (c)
+ BIO_printf(arg, "%s\n",
EVP_CIPHER_name(c));
+ else
+ {
+ if (!from)
+ from = "<undefined>";
+ if (!to)
+ to = "<undefined>";
+ BIO_printf(arg, "%s => %s\n", from,
to);
+ }
+ }
+
+static void list_cipher(BIO *out)
+ {
+ EVP_CIPHER_do_all_sorted(list_cipher_fn, out);
+ }
+
+static void list_md_fn(const EVP_MD *m,
+ const char *from, const char *to, void *arg)
+ {
+ if (m)
+ BIO_printf(arg, "%s\n", EVP_MD_name(m));
+ else
+ {
+ if (!from)
+ from = "<undefined>";
+ if (!to)
+ to = "<undefined>";
+ BIO_printf(arg, "%s => %s\n", from,
to);
+ }
+ }
+
+static void list_md(BIO *out)
+ {
+ EVP_MD_do_all_sorted(list_md_fn, out);
+ }
+
static LHASH *prog_init(void)
{
LHASH *ret;
.
patch -p0 <<' .'
Index: openssl/apps/progs.h
============================================================
================
$ cvs diff -u -r1.41 -r1.42 progs.h
--- openssl/apps/progs.h 9 Jun 2006 15:44:27 -0000 1.41
+++ openssl/apps/progs.h 9 Jul 2006 00:53:44 -0000 1.42
-50,6 +50,8
#define FUNC_TYPE_MD 2
#define FUNC_TYPE_CIPHER 3
#define FUNC_TYPE_PKEY 4
+#define FUNC_TYPE_MD_ALG 5
+#define FUNC_TYPE_CIPHER_ALG 6
typedef struct {
int type;
.
patch -p0 <<' .'
Index: openssl/apps/progs.pl
============================================================
================
$ cvs diff -u -r1.20 -r1.21 progs.pl
--- openssl/apps/progs.pl 9 Jun 2006 15:44:27 -0000 1.20
+++ openssl/apps/progs.pl 9 Jul 2006 00:53:44 -0000 1.21
-14,6 +14,8
#define FUNC_TYPE_MD 2
#define FUNC_TYPE_CIPHER 3
#define FUNC_TYPE_PKEY 4
+#define FUNC_TYPE_MD_ALG 5
+#define FUNC_TYPE_CIPHER_ALG 6
typedef struct {
int type;
.
patch -p0 <<' .'
Index: openssl/crypto/evp/evp.h
============================================================
================
$ cvs diff -u -r1.163 -r1.164 evp.h
--- openssl/crypto/evp/evp.h 9 Jun 2006 15:44:40
-0000 1.163
+++ openssl/crypto/evp/evp.h 9 Jul 2006 00:53:45
-0000 1.164
-782,6 +782,16
const EVP_MD *EVP_get_digestbyname(const char *name);
void EVP_cleanup(void);
+void EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *ciph,
+ const char *from, const char *to, void *x), void *arg);
+void EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER
*ciph,
+ const char *from, const char *to, void *x), void *arg);
+
+void EVP_MD_do_all(void (*fn)(const EVP_MD *ciph,
+ const char *from, const char *to, void *x), void *arg);
+void EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *ciph,
+ const char *from, const char *to, void *x), void *arg);
+
int EVP_PKEY_decrypt_old(unsigned char *dec_key,
const unsigned char *enc_key,int enc_key_len,
EVP_PKEY *private_key);
.
patch -p0 <<' .'
Index: openssl/crypto/evp/names.c
============================================================
================
$ cvs diff -u -r1.9 -r1.10 names.c
--- openssl/crypto/evp/names.c 28 Mar 2006 17:23:48
-0000 1.9
+++ openssl/crypto/evp/names.c 9 Jul 2006 00:53:45
-0000 1.10
-76,6 +76,7
return(r);
}
+
int EVP_add_digest(const EVP_MD *md)
{
int r;
-132,3 +133,71
OBJ_cleanup();
}
}
+
+struct doall_cipher
+ {
+ void *arg;
+ void (*fn)(const EVP_CIPHER *ciph,
+ const char *from, const char *to, void *arg);
+ };
+
+static void do_all_cipher_fn(const OBJ_NAME *nm, void
*arg)
+ {
+ struct doall_cipher *dc = arg;
+ if (nm->alias)
+ dc->fn(NULL, nm->name, nm->data, dc->arg);
+ else
+ dc->fn((const EVP_CIPHER *)nm->data, NULL, NULL,
dc->arg);
+ }
+
+void EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *ciph,
+ const char *from, const char *to, void *x), void *arg)
+ {
+ struct doall_cipher dc;
+ dc.fn = fn;
+ dc.arg = arg;
+ OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH,
do_all_cipher_fn, &dc);
+ }
+
+void EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER
*ciph,
+ const char *from, const char *to, void *x), void *arg)
+ {
+ struct doall_cipher dc;
+ dc.fn = fn;
+ dc.arg = arg;
+ OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
do_all_cipher_fn,&dc);
+ }
+
+struct doall_md
+ {
+ void *arg;
+ void (*fn)(const EVP_MD *ciph,
+ const char *from, const char *to, void *arg);
+ };
+
+static void do_all_md_fn(const OBJ_NAME *nm, void *arg)
+ {
+ struct doall_md *dc = arg;
+ if (nm->alias)
+ dc->fn(NULL, nm->name, nm->data, dc->arg);
+ else
+ dc->fn((const EVP_MD *)nm->data, NULL, NULL,
dc->arg);
+ }
+
+void EVP_MD_do_all(void (*fn)(const EVP_MD *md,
+ const char *from, const char *to, void *x), void *arg)
+ {
+ struct doall_md dc;
+ dc.fn = fn;
+ dc.arg = arg;
+ OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, do_all_md_fn,
&dc);
+ }
+
+void EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *md,
+ const char *from, const char *to, void *x), void *arg)
+ {
+ struct doall_md dc;
+ dc.fn = fn;
+ dc.arg = arg;
+ OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH,
do_all_md_fn, &dc);
+ }
.
patch -p0 <<' .'
Index: openssl/crypto/lhash/lhash.c
============================================================
================
$ cvs diff -u -r1.27 -r1.28 lhash.c
--- openssl/crypto/lhash/lhash.c 5 Apr 2005 10:29:43
-0000 1.27
+++ openssl/crypto/lhash/lhash.c 9 Jul 2006 00:53:45
-0000 1.28
-273,6 +273,9
int i;
LHASH_NODE *a,*n;
+ if (lh == NULL)
+ return;
+
/* reverse the order so we search from 'top to bottom'
* We were having memory leaks otherwise */
for (i=lh->num_nodes-1; i>=0; i--)
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|