*** empty log message ***

diff --git a/lib/minitasn1/structure.c b/lib/minitasn1/structure.c
index 1291a00981820e9750e08b89be041e3f1bb82b26..97834e9e7769021b33427815d4720838ff55df8a 100644 (file)
--- 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)
-         fprintf(out,"  value:%s",p->value);
+         if (p->value) fprintf(out,"  value:%s",p->value);
        break;
       case TYPE_SIZE:
        if(mode == ASN1_PRINT_ALL)

diff --git a/src/common.c b/src/common.c
index be5a3a451ae451e901f4151d08d85065a075b8ce..8b9a411c1957cdcabbfba6716c71c533db30d2fd 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -515,7 +515,7 @@ void print_list(void)
        printf(", ANON-DH\n");
 
        printf("Compression methods:");
-       printf(" ZLIB");
+       printf(" DEFLATE");
        printf(", LZO");
        printf(", NULL\n");
 }
@@ -649,10 +649,13 @@ void parse_comp(char **comp, int ncomp, int *comp_priority)
                for (j = i = 0; i < ncomp; i++) {
                        if (strncasecmp(comp[i], "NUL", 3) == 0)
                                comp_priority[j++] = GNUTLS_COMP_NULL;
-                       if (strncasecmp(comp[i], "ZLI", 3) == 0)
-                               comp_priority[j++] = GNUTLS_COMP_ZLIB;
-                       if (strncasecmp(comp[i], "LZO", 3) == 0)
+                       else if (strncasecmp(comp[i], "ZLI", 3) == 0)
+                               comp_priority[j++] = GNUTLS_COMP_DEFLATE;
+                       else if (strncasecmp(comp[i], "DEF", 3) == 0)
+                               comp_priority[j++] = GNUTLS_COMP_DEFLATE;
+                       else if (strncasecmp(comp[i], "LZO", 3) == 0)
                                comp_priority[j++] = GNUTLS_COMP_LZO;
+                       else fprintf(stderr, "Unknown compression: '%s'\n", comp[i]);
                }
                comp_priority[j] = 0;
        }