summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2003-11-09 20:22:10 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2003-11-09 20:22:10 +0000
commite5faa9f47cdcb0f6c1323c512a2d289f07d945b1 (patch)
tree9dac199b5f8296be31bfffbf535ebc5cb39deaed
parent8e22be36c2bd6a150588c500921126d1f52c9628 (diff)
downloadgnutls-e5faa9f47cdcb0f6c1323c512a2d289f07d945b1.tar.gz
Included the new libtasn 0.2.6.
-rw-r--r--lib/minitasn1/errors.c2
-rw-r--r--lib/minitasn1/int.h2
-rw-r--r--lib/minitasn1/libtasn1.h2
-rw-r--r--lib/minitasn1/mem.h4
-rw-r--r--lib/minitasn1/structure.c2
5 files changed, 5 insertions, 7 deletions
diff --git a/lib/minitasn1/errors.c b/lib/minitasn1/errors.c
index 56f43d5568..70f38cb3a8 100644
--- a/lib/minitasn1/errors.c
+++ b/lib/minitasn1/errors.c
@@ -114,6 +114,8 @@ void _libtasn1_log( const char *fmt, ...) {
va_end(args);
fprintf(stderr, str);
+
+ return;
}
#else /* not DEBUG */
# ifndef C99_MACROS
diff --git a/lib/minitasn1/int.h b/lib/minitasn1/int.h
index 9aa0543d0b..65d45eb321 100644
--- a/lib/minitasn1/int.h
+++ b/lib/minitasn1/int.h
@@ -32,7 +32,7 @@
#include <mem.h>
-#define LIBTASN1_VERSION "0.2.5"
+#define LIBTASN1_VERSION "0.2.6"
#define MAX32 4294967295
#define MAX24 16777215
diff --git a/lib/minitasn1/libtasn1.h b/lib/minitasn1/libtasn1.h
index e1bb380167..68d245a460 100644
--- a/lib/minitasn1/libtasn1.h
+++ b/lib/minitasn1/libtasn1.h
@@ -28,7 +28,7 @@
extern "C" {
#endif
-#define LIBTASN1_VERSION "0.2.5"
+#define LIBTASN1_VERSION "0.2.6"
#include <sys/types.h>
#include <time.h>
diff --git a/lib/minitasn1/mem.h b/lib/minitasn1/mem.h
index 292212a560..e4af84445d 100644
--- a/lib/minitasn1/mem.h
+++ b/lib/minitasn1/mem.h
@@ -5,11 +5,7 @@
* memory leaks may occur in systems which do not
* support alloca.
*/
-#include "../config.h"
#ifdef HAVE_ALLOCA
-# ifdef HAVE_ALLOCA_H
-# include <alloca.h>
-# endif
# define _asn1_alloca alloca
# define _asn1_afree(x)
#else
diff --git a/lib/minitasn1/structure.c b/lib/minitasn1/structure.c
index fbcd832d18..1291a00981 100644
--- a/lib/minitasn1/structure.c
+++ b/lib/minitasn1/structure.c
@@ -661,7 +661,7 @@ asn1_print_structure(FILE *out,ASN1_TYPE structure,const char *name,int mode)
break;
case TYPE_TAG:
if(mode == ASN1_PRINT_ALL)
- if(p->value) fprintf(out," value:%s",p->value);
+ fprintf(out," value:%s",p->value);
break;
case TYPE_SIZE:
if(mode == ASN1_PRINT_ALL)