Update for OpenSSL 0.9.7. No assembler code at the moment. This

will follow.

1 files changed, 178 insertions, 32 deletions

diff --git a/secure/lib/libcrypto/man/lhash.3 b/secure/lib/libcrypto/man/lhash.3
index e5ee467..f698fce 100644
--- a/secure/lib/libcrypto/man/lhash.3
+++ b/secure/lib/libcrypto/man/lhash.3
@@ -1,5 +1,5 @@
 .\" Automatically generated by Pod::Man version 1.15
-.\" Tue Jul 30 09:22:07 2002
+.\" Mon Jan 13 19:29:23 2003
 .\"
 .\" Standard preamble:
 .\" ======================================================================
@@ -138,19 +138,17 @@
 .\" ======================================================================
 .\"
 .IX Title "lhash 3"
-.TH lhash 3 "0.9.6e" "2000-11-12" "OpenSSL"
+.TH lhash 3 "0.9.7" "2003-01-13" "OpenSSL"
 .UC
 .SH "NAME"
-lh_new, lh_free, lh_insert, lh_delete, lh_retrieve, lh_doall,
-lh_doall_arg, lh_error \- dynamic hash table
+lh_new, lh_free, lh_insert, lh_delete, lh_retrieve, lh_doall, lh_doall_arg, lh_error \- dynamic hash table
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 .Vb 1
 \& #include <openssl/lhash.h>
 .Ve
-.Vb 3
-\& LHASH *lh_new(unsigned long (*hash)(/*void *a*/),
-\&          int (*compare)(/*void *a,void *b*/));
+.Vb 2
+\& LHASH *lh_new(LHASH_HASH_FN_TYPE hash, LHASH_COMP_FN_TYPE compare);
 \& void lh_free(LHASH *table);
 .Ve
 .Vb 3
@@ -159,29 +157,102 @@ lh_doall_arg, lh_error \- dynamic hash table
 \& void *lh_retrieve(LHASH *table, void *data);
 .Ve
 .Vb 3
-\& void lh_doall(LHASH *table, void (*func)(/*void *b*/));
-\& void lh_doall_arg(LHASH *table, void (*func)(/*void *a,void *b*/),
+\& void lh_doall(LHASH *table, LHASH_DOALL_FN_TYPE func);
+\& void lh_doall_arg(LHASH *table, LHASH_DOALL_ARG_FN_TYPE func,
 \&          void *arg);
 .Ve
 .Vb 1
 \& int lh_error(LHASH *table);
 .Ve
+.Vb 4
+\& typedef int (*LHASH_COMP_FN_TYPE)(const void *, const void *);
+\& typedef unsigned long (*LHASH_HASH_FN_TYPE)(const void *);
+\& typedef void (*LHASH_DOALL_FN_TYPE)(const void *);
+\& typedef void (*LHASH_DOALL_ARG_FN_TYPE)(const void *, const void *);
+.Ve
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
 This library implements dynamic hash tables. The hash table entries
 can be arbitrary structures. Usually they consist of key and value
 fields.
 .PP
-\&\fIlh_new()\fR creates a new \fB\s-1LHASH\s0\fR structure. \fBhash\fR takes a pointer to
-the structure and returns an unsigned long hash value of its key
-field. The hash value is normally truncated to a power of 2, so make
-sure that your hash function returns well mixed low order
-bits. \fBcompare\fR takes two arguments, and returns 0 if their keys are
-equal, non-zero otherwise.
+\&\fIlh_new()\fR creates a new \fB\s-1LHASH\s0\fR structure to store arbitrary data
+entries, and provides the 'hash' and 'compare' callbacks to be used in
+organising the table's entries.  The \fBhash\fR callback takes a pointer
+to a table entry as its argument and returns an unsigned long hash
+value for its key field.  The hash value is normally truncated to a
+power of 2, so make sure that your hash function returns well mixed
+low order bits.  The \fBcompare\fR callback takes two arguments (pointers
+to two hash table entries), and returns 0 if their keys are equal,
+non-zero otherwise.  If your hash table will contain items of some
+particular type and the \fBhash\fR and \fBcompare\fR callbacks hash/compare
+these types, then the \fB\s-1DECLARE_LHASH_HASH_FN\s0\fR and
+\&\fB\s-1IMPLEMENT_LHASH_COMP_FN\s0\fR macros can be used to create callback
+wrappers of the prototypes required by \fIlh_new()\fR.  These provide
+per-variable casts before calling the type-specific callbacks written
+by the application author.  These macros, as well as those used for
+the \*(L"doall\*(R" callbacks, are defined as;
+.PP
+.Vb 7
+\& #define DECLARE_LHASH_HASH_FN(f_name,o_type) \e
+\&         unsigned long f_name##_LHASH_HASH(const void *);
+\& #define IMPLEMENT_LHASH_HASH_FN(f_name,o_type) \e
+\&         unsigned long f_name##_LHASH_HASH(const void *arg) { \e
+\&                 o_type a = (o_type)arg; \e
+\&                 return f_name(a); }
+\& #define LHASH_HASH_FN(f_name) f_name##_LHASH_HASH
+.Ve
+.Vb 8
+\& #define DECLARE_LHASH_COMP_FN(f_name,o_type) \e
+\&         int f_name##_LHASH_COMP(const void *, const void *);
+\& #define IMPLEMENT_LHASH_COMP_FN(f_name,o_type) \e
+\&         int f_name##_LHASH_COMP(const void *arg1, const void *arg2) { \e
+\&                 o_type a = (o_type)arg1; \e
+\&                 o_type b = (o_type)arg2; \e
+\&                 return f_name(a,b); }
+\& #define LHASH_COMP_FN(f_name) f_name##_LHASH_COMP
+.Ve
+.Vb 7
+\& #define DECLARE_LHASH_DOALL_FN(f_name,o_type) \e
+\&         void f_name##_LHASH_DOALL(const void *);
+\& #define IMPLEMENT_LHASH_DOALL_FN(f_name,o_type) \e
+\&         void f_name##_LHASH_DOALL(const void *arg) { \e
+\&                 o_type a = (o_type)arg; \e
+\&                 f_name(a); }
+\& #define LHASH_DOALL_FN(f_name) f_name##_LHASH_DOALL
+.Ve
+.Vb 8
+\& #define DECLARE_LHASH_DOALL_ARG_FN(f_name,o_type,a_type) \e
+\&         void f_name##_LHASH_DOALL_ARG(const void *, const void *);
+\& #define IMPLEMENT_LHASH_DOALL_ARG_FN(f_name,o_type,a_type) \e
+\&         void f_name##_LHASH_DOALL_ARG(const void *arg1, const void *arg2) { \e
+\&                 o_type a = (o_type)arg1; \e
+\&                 a_type b = (a_type)arg2; \e
+\&                 f_name(a,b); }
+\& #define LHASH_DOALL_ARG_FN(f_name) f_name##_LHASH_DOALL_ARG
+.Ve
+An example of a hash table storing (pointers to) structures of type '\s-1STUFF\s0'
+could be defined as follows;
 .PP
+.Vb 14
+\& /* Calculates the hash value of 'tohash' (implemented elsewhere) */
+\& unsigned long STUFF_hash(const STUFF *tohash);
+\& /* Orders 'arg1' and 'arg2' (implemented elsewhere) */
+\& int STUFF_cmp(const STUFF *arg1, const STUFF *arg2);
+\& /* Create the type-safe wrapper functions for use in the LHASH internals */
+\& static IMPLEMENT_LHASH_HASH_FN(STUFF_hash, const STUFF *)
+\& static IMPLEMENT_LHASH_COMP_FN(STUFF_cmp, const STUFF *);
+\& /* ... */
+\& int main(int argc, char *argv[]) {
+\&         /* Create the new hash table using the hash/compare wrappers */
+\&         LHASH *hashtable = lh_new(LHASH_HASH_FN(STUFF_hash),
+\&                                   LHASH_COMP_FN(STUFF_cmp));
+\&         /* ... */
+\& }
+.Ve
 \&\fIlh_free()\fR frees the \fB\s-1LHASH\s0\fR structure \fBtable\fR. Allocated hash table
 entries will not be freed; consider using \fIlh_doall()\fR to deallocate any
-remaining entries in the hash table.
+remaining entries in the hash table (see below).
 .PP
 \&\fIlh_insert()\fR inserts the structure pointed to by \fBdata\fR into \fBtable\fR.
 If there already is an entry with the same key, the old value is
@@ -195,23 +266,55 @@ a structure with the key \fIfield\fR\|(s) set; the function will return a
 pointer to a fully populated structure.
 .PP
 \&\fIlh_doall()\fR will, for every entry in the hash table, call \fBfunc\fR with
-the data item as parameters.
-This function can be quite useful when used as follows:
- void cleanup(\s-1STUFF\s0 *a)
-  { \fISTUFF_free\fR\|(a); }
- lh_doall(hash,cleanup);
- lh_free(hash);
-This can be used to free all the entries. \fIlh_free()\fR then cleans up the
-\&'buckets' that point to nothing. When doing this, be careful if you
-delete entries from the hash table in \fBfunc\fR: the table may decrease
-in size, moving item that you are currently on down lower in the hash
-table.  This could cause some entries to be skipped.  The best
-solution to this problem is to set hash->down_load=0 before you
-start.  This will stop the hash table ever being decreased in size.
+the data item as its parameter.  For \fIlh_doall()\fR and \fIlh_doall_arg()\fR,
+function pointer casting should be avoided in the callbacks (see
+\&\fB\s-1NOTE\s0\fR) \- instead, either declare the callbacks to match the
+prototype required in \fIlh_new()\fR or use the declare/implement macros to
+create type-safe wrappers that cast variables prior to calling your
+type-specific callbacks.  An example of this is illustrated here where
+the callback is used to cleanup resources for items in the hash table
+prior to the hashtable itself being deallocated:
 .PP
-\&\fIlh_doall_arg()\fR is the same as \fIlh_doall()\fR except that \fBfunc\fR will
-be called with \fBarg\fR as the second argument.
+.Vb 9
+\& /* Cleans up resources belonging to 'a' (this is implemented elsewhere) */
+\& void STUFF_cleanup(STUFF *a);
+\& /* Implement a prototype-compatible wrapper for "STUFF_cleanup" */
+\& IMPLEMENT_LHASH_DOALL_FN(STUFF_cleanup, STUFF *)
+\&         /* ... then later in the code ... */
+\& /* So to run "STUFF_cleanup" against all items in a hash table ... */
+\& lh_doall(hashtable, LHASH_DOALL_FN(STUFF_cleanup));
+\& /* Then the hash table itself can be deallocated */
+\& lh_free(hashtable);
+.Ve
+When doing this, be careful if you delete entries from the hash table
+in your callbacks: the table may decrease in size, moving the item
+that you are currently on down lower in the hash table \- this could
+cause some entries to be skipped during the iteration.  The second
+best solution to this problem is to set hash->down_load=0 before
+you start (which will stop the hash table ever decreasing in size).
+The best solution is probably to avoid deleting items from the hash
+table inside a \*(L"doall\*(R" callback!
+.PP
+\&\fIlh_doall_arg()\fR is the same as \fIlh_doall()\fR except that \fBfunc\fR will be
+called with \fBarg\fR as the second argument and \fBfunc\fR should be of
+type \fB\s-1LHASH_DOALL_ARG_FN_TYPE\s0\fR (a callback prototype that is passed
+both the table entry and an extra argument).  As with \fIlh_doall()\fR, you
+can instead choose to declare your callback with a prototype matching
+the types you are dealing with and use the declare/implement macros to
+create compatible wrappers that cast variables before calling your
+type-specific callbacks.  An example of this is demonstrated here
+(printing all hash table entries to a \s-1BIO\s0 that is provided by the
+caller):
 .PP
+.Vb 7
+\& /* Prints item 'a' to 'output_bio' (this is implemented elsewhere) */
+\& void STUFF_print(const STUFF *a, BIO *output_bio);
+\& /* Implement a prototype-compatible wrapper for "STUFF_print" */
+\& static IMPLEMENT_LHASH_DOALL_ARG_FN(STUFF_print, const STUFF *, BIO *)
+\&         /* ... then later in the code ... */
+\& /* Print out the entire hashtable to a particular BIO */
+\& lh_doall_arg(hashtable, LHASH_DOALL_ARG_FN(STUFF_print), logging_bio);
+.Ve
 \&\fIlh_error()\fR can be used to determine if an error occurred in the last
 operation. \fIlh_error()\fR is a macro.
 .SH "RETURN VALUES"
@@ -232,6 +335,44 @@ there is no such value in the hash table.
 otherwise.
 .PP
 \&\fIlh_free()\fR, \fIlh_doall()\fR and \fIlh_doall_arg()\fR return no values.
+.SH "NOTE"
+.IX Header "NOTE"
+The various \s-1LHASH\s0 macros and callback types exist to make it possible
+to write type-safe code without resorting to function-prototype
+casting \- an evil that makes application code much harder to
+audit/verify and also opens the window of opportunity for stack
+corruption and other hard-to-find bugs.  It also, apparently, violates
+\&\s-1ANSI-C\s0.
+.PP
+The \s-1LHASH\s0 code regards table entries as constant data.  As such, it
+internally represents \fIlh_insert()\fR'd items with a \*(L"const void *\*(R"
+pointer type.  This is why callbacks such as those used by \fIlh_doall()\fR
+and \fIlh_doall_arg()\fR declare their prototypes with \*(L"const\*(R", even for the
+parameters that pass back the table items' data pointers \- for
+consistency, user-provided data is \*(L"const\*(R" at all times as far as the
+\&\s-1LHASH\s0 code is concerned.  However, as callers are themselves providing
+these pointers, they can choose whether they too should be treating
+all such parameters as constant.
+.PP
+As an example, a hash table may be maintained by code that, for
+reasons of encapsulation, has only \*(L"const\*(R" access to the data being
+indexed in the hash table (ie. it is returned as \*(L"const\*(R" from
+elsewhere in their code) \- in this case the \s-1LHASH\s0 prototypes are
+appropriate as-is.  Conversely, if the caller is responsible for the
+life-time of the data in question, then they may well wish to make
+modifications to table item passed back in the \fIlh_doall()\fR or
+\&\fIlh_doall_arg()\fR callbacks (see the \*(L"STUFF_cleanup\*(R" example above).  If
+so, the caller can either cast the \*(L"const\*(R" away (if they're providing
+the raw callbacks themselves) or use the macros to declare/implement
+the wrapper functions without \*(L"const\*(R" types.
+.PP
+Callers that only have \*(L"const\*(R" access to data they're indexing in a
+table, yet declare callbacks without constant types (or cast the
+\&\*(L"const\*(R" away themselves), are therefore creating their own risks/bugs
+without being encouraged to do so by the \s-1API\s0.  On a related note,
+those auditing code should pay special attention to any instances of
+DECLARE/IMPLEMENT_LHASH_DOALL_[\s-1ARG_\s0]_FN macros that provide types
+without any \*(L"const\*(R" qualifiers.
 .SH "BUGS"
 .IX Header "BUGS"
 \&\fIlh_insert()\fR returns \fB\s-1NULL\s0\fR both for success and error.
@@ -271,7 +412,7 @@ generating hashes that are the same for different values.  It is
 probably worth changing your hash function if this is the case because
 even if your hash table has 10 items in a 'bucket', it can be searched
 with 10 \fBunsigned long\fR compares and 10 linked list traverses.  This
-will be much less expensive that 10 calls to you compare function.
+will be much less expensive that 10 calls to your compare function.
 .PP
 \&\fIlh_strhash()\fR is a demo string hashing function:
 .PP
@@ -290,3 +431,8 @@ The \fBlhash\fR library is available in all versions of SSLeay and OpenSSL.
 \&\fIlh_error()\fR was added in SSLeay 0.9.1b.
 .PP
 This manpage is derived from the SSLeay documentation.
+.PP
+In OpenSSL 0.9.7, all lhash functions that were passed function pointers
+were changed for better type safety, and the function types \s-1LHASH_COMP_FN_TYPE\s0,
+\&\s-1LHASH_HASH_FN_TYPE\s0, \s-1LHASH_DOALL_FN_TYPE\s0 and \s-1LHASH_DOALL_ARG_FN_TYPE\s0 
+became available.