OpenSSL 0.9.5a merge

2 files changed, 6 insertions, 16 deletions

diff --git a/src/lib/libcrypto/lhash/lhash.c b/src/lib/libcrypto/lhash/lhash.c
index 6a340a2403..7eb92a18bc 100644
--- a/src/lib/libcrypto/lhash/lhash.c
+++ b/src/lib/libcrypto/lhash/lhash.c
@@ -159,7 +159,7 @@ void lh_free(LHASH *lh)
         unsigned int i;
         LHASH_NODE *n,*nn;
 
-        if(lh == NULL)
+        if (lh == NULL)
             return;
 
         for (i=0; i<lh->num_nodes; i++)
@@ -422,21 +422,6 @@ static LHASH_NODE **getrn(LHASH *lh, void *data, unsigned long *rhash)
         return(ret);
         }
 
-/*
-unsigned long lh_strhash(char *str)
-        {
-        int i,l;
-        unsigned long ret=0;
-        unsigned short *s;
-
-        if (str == NULL) return(0);
-        l=(strlen(str)+1)/2;
-        s=(unsigned short *)str;
-        for (i=0; i<l; i++)
-                ret^=(s[i]<<(i&0x0f));
-        return(ret);
-        } */
-
 /* The following hash seems to work very well on normal text strings
  * no collisions on /usr/dict/words and it distributes on %2^n quite
  * well, not as good as MD5, but still good.
@@ -470,3 +455,7 @@ unsigned long lh_strhash(const char *c)
         return((ret>>16)^ret);
         }
 
+unsigned long lh_num_items(LHASH *lh)
+        {
+        return lh ? lh->num_items : 0;
+        }
diff --git a/src/lib/libcrypto/lhash/lhash.h b/src/lib/libcrypto/lhash/lhash.h
index 6f6eeb2698..d315fd9c6d 100644
--- a/src/lib/libcrypto/lhash/lhash.h
+++ b/src/lib/libcrypto/lhash/lhash.h
@@ -124,6 +124,7 @@ void *lh_retrieve(LHASH *lh, void *data);
     void lh_doall(LHASH *lh, void (*func)(/*void *b*/));
 void lh_doall_arg(LHASH *lh, void (*func)(/*void *a,void *b*/),void *arg);
 unsigned long lh_strhash(const char *c);
+unsigned long lh_num_items(LHASH *lh);
 
 #ifndef NO_FP_API
 void lh_stats(LHASH *lh, FILE *out);