Changeset 553

Timestamp:

03/05/08 13:54:36

Author:

rachel

Message:

Added support for BZIP2 decompression

Files:

• openpgpsdk/trunk/configure (modified) (1 diff)
• openpgpsdk/trunk/include/openpgpsdk/errors.h (modified) (1 diff)
• openpgpsdk/trunk/src/lib/adv_compress.c (modified) (8 diffs)
• openpgpsdk/trunk/tests/test_rsa_decrypt.c (modified) (1 diff)

openpgpsdk/trunk/configure

@@ -25 +25 @@
-our %Subst=(
-            CRYPTO_LIBS => '-lcrypto',
-
+ -lbz2
-            INCLUDES => '',
-            CFLAGS => '',

openpgpsdk/trunk/include/openpgpsdk/errors.h

@@ -36 +36 @@
-    OPS_E_P_MPI_FORMAT_ERROR    =OPS_E_P+4,
-    OPS_E_P_PACKET_NOT_CONSUMED =OPS_E_P+5,
+    OPS_E_P_DECOMPRESSION_ERROR =OPS_E_P+6,
-
-    /* creator errors */

openpgpsdk/trunk/src/lib/adv_compress.c

@@ -3 +3 @@
-   
-#include <zlib.h>
+#include <bzlib.h>
-#include <assert.h>
-#include <string.h>
@@ -17 +18 @@
-typedef struct
-    {
+    ops_compression_type_t type;
-    ops_region_t *region;
-    unsigned char in[DECOMPRESS_BUFFER];
-    unsigned char out[DECOMPRESS_BUFFER];
-stream;
+zstream; // ZIP and ZLIB
-    size_t offset;
-    int inflate_ret;
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-typedef struct
@@ -34 +47 @@
-#define ERR(err)        do { content.content.error.error=err; content.tag=OPS_PARSER_ERROR; ops_parse_cb(&content,cbinfo); return -1; } while(0)
-
-
+
+
-                                  ops_error_t **errors,
-                                  ops_reader_info_t *rinfo,
-                                  ops_parse_cb_info_t *cbinfo)
-    {
-
+
+
+
-    ops_parser_content_t content;
-    int saved=length;
-
-    if(/*arg->region->indeterminate && */ arg->inflate_ret == Z_STREAM_END
-
-       
+z
+        
-
-    if(arg->region->length_read == arg->region->length)
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    while(length > 0)
@@ -61 +78 @@
-        unsigned len;
-
-
+z
-            {
-            int ret;
-
-
-
+z
+z
-            arg->offset=0;
-
+z
-                {
-                unsigned n=arg->region->length;
@@ -85 +102 @@
-                    return -1;
-
-
-
+z
+z
-                    ? arg->region->last_read : n;
-                }
-
-
+z
-            if(ret == Z_STREAM_END)
-                {
@@ -100 +117 @@
-                {
-                fprintf(stderr,"ret=%d\n",ret);
-
+z
-                }
-            arg->inflate_ret=ret;
-            }
-
-
+z
+z
-        if(len > length)
-            len=length;
@@ -116 +133 @@
-    }
-
+// \todo remove code duplication between this and zlib_compressed_data_reader
+static int bzip2_compressed_data_reader(void *dest,size_t length,
+                                  ops_error_t **errors,
+                                  ops_reader_info_t *rinfo,
+                                  ops_parse_cb_info_t *cbinfo)
+    {
+    bz_decompress_arg_t *arg=ops_reader_get_arg(rinfo);
+    assert(arg->type==OPS_C_BZIP2);
+
+    ops_parser_content_t content;
+    int saved=length;
+
+    if(arg->inflate_ret == BZ_STREAM_END
+       && arg->bzstream.next_out == &arg->out[arg->offset])
+        return 0;
+
+    if(arg->region->length_read == arg->region->length)
+        {
+        if(arg->inflate_ret != BZ_STREAM_END)
+            ERR("Compressed data didn't end when region ended.");
+        }
+
+    while(length > 0)
+        {
+        unsigned len;
+
+        if(&arg->out[arg->offset] == arg->bzstream.next_out)
+            {
+            int ret;
+
+            arg->bzstream.next_out=(char *) arg->out;
+            arg->bzstream.avail_out=sizeof arg->out;
+            arg->offset=0;
+            if(arg->bzstream.avail_in == 0)
+                {
+                unsigned n=arg->region->length;
+
+                if(!arg->region->indeterminate)
+                    {
+                    n-=arg->region->length_read;
+                    if(n > sizeof arg->in)
+                        n=sizeof arg->in;
+                    }
+                else
+                    n=sizeof arg->in;
+
+                if(!ops_stacked_limited_read((unsigned char *)arg->in,n,arg->region,
+                                             errors,rinfo,cbinfo))
+                    return -1;
+
+                arg->bzstream.next_in=arg->in;
+                arg->bzstream.avail_in=arg->region->indeterminate
+                    ? arg->region->last_read : n;
+                }
+
+            ret=BZ2_bzDecompress(&arg->bzstream);
+            if(ret == BZ_STREAM_END)
+                {
+                if(!arg->region->indeterminate
+                   && arg->region->length_read != arg->region->length)
+                    ERR("Compressed stream ended before packet end.");
+                }
+            else if(ret != BZ_OK)
+                {
+                fprintf(stderr,"ret=%d\n",ret);
+        //              ERR(arg->bzstream.msg); //\todo add error handling
+                }
+            arg->inflate_ret=ret;
+            }
+        assert(arg->bzstream.next_out > &arg->out[arg->offset]);
+        len=arg->bzstream.next_out-&arg->out[arg->offset];
+        if(len > length)
+            len=length;
+        memcpy(dest,&arg->out[arg->offset],len);
+        arg->offset+=len;
+        length-=len;
+        }
+
+    return saved;
+    }
+
-/**
- * \ingroup Utils
@@ -126 +224 @@
-                   ops_compression_type_t type)
-    {
-
+
+
-    int ret;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        OPS_ERROR_1(&parse_info->errors, OPS_E_ALG_UNSUPPORTED_COMPRESS_ALG, "Compression algorithm %s is not yet supported", "BZIP2");
-        return 0;
-
-
-
+
+
+
+
+
-        OPS_ERROR_1(&parse_info->errors, OPS_E_ALG_UNSUPPORTED_COMPRESS_ALG, "Compression algorithm %d is not yet supported", type);
-        return 0;
-        }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    ret=ops_parse(parse_info);

openpgpsdk/trunk/tests/test_rsa_decrypt.c

@@ -22 +22 @@
-static char *current_passphrase=NULL;
-
-/* \todo add support for bzip2
-static char *algos[]={ "zip", "zlib", "bzip2" };
-static int n_algos=3;
-*/
-
-static char *algos[]={ "zip", "zlib" };
-static int n_algos=2;
-
-static ops_parse_cb_return_t