Separate DSA functionality from ASN.1 encoding.

[openssl.git] / crypto / txt_db / txt_db.c

diff --git a/crypto/txt_db/txt_db.c b/crypto/txt_db/txt_db.c
index ae8db3917bfeaee3f4c2b40a0f72b3925214072a..34a87e332d8097f9c3716d08d28eda8e2257983e 100644 (file)
--- a/crypto/txt_db/txt_db.c
+++ b/crypto/txt_db/txt_db.c
@@ -1,5 +1,5 @@
 /* crypto/txt_db/txt_db.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
@@ -66,7 +66,7 @@
 #undef BUFSIZE
 #define BUFSIZE        512
 
-char *TXT_DB_version="TXT_DB part of SSLeay 0.8.1b 29-Jun-1998";
+char *TXT_DB_version="TXT_DB" OPENSSL_VERSION_PTEXT;
 
 TXT_DB *TXT_DB_read(in,num)
 BIO *in;
@@ -157,8 +157,8 @@ int num;
                *(p++)='\0';
                if ((n != num) || (*f != '\0'))
                        {
-#ifndef WIN16  /* temporaty fix :-( */
-                       fprintf(stderr,"wrong number of fields on line %ld\n",ln);
+#if !defined(NO_STDIO) && !defined(WIN16)      /* temporaty fix :-( */
+                       fprintf(stderr,"wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f);
 #endif
                        er=2;
                        goto err;
@@ -166,7 +166,7 @@ int num;
                pp[n]=p;
                if (!sk_push(ret->data,(char *)pp))
                        {
-#ifndef WIN16  /* temporaty fix :-( */
+#if !defined(NO_STDIO) && !defined(WIN16)      /* temporaty fix :-( */
                        fprintf(stderr,"failure in sk_push\n");
 #endif
                        er=2;
@@ -178,7 +178,7 @@ err:
        BUF_MEM_free(buf);
        if (er)
                {
-#ifndef WIN16
+#if !defined(NO_STDIO) && !defined(WIN16)
                if (er == 1) fprintf(stderr,"Malloc failure\n");
 #endif
                if (ret->data != NULL) sk_free(ret->data);
@@ -356,6 +356,9 @@ TXT_DB *db;
        int i,n;
        char **p,*max;
 
+       if(db == NULL)
+           return;
+
        if (db->index != NULL)
                {
                for (i=db->num_fields-1; i>=0; i--)