zipruby 0.2.1 → 0.2.2

data/README.txt

@@ -21,7 +21,7 @@ gem install zipruby
 https://rubyforge.org/frs/?group_id=6124
 
 == Example
-=== reading zip archives
+=== reading zip archive
 
     require 'zipruby'
     
@@ -64,7 +64,7 @@ https://rubyforge.org/frs/?group_id=6124
       end
     end
 
-=== creating zip archives
+=== creating zip archive
 
     require 'zipruby'
     
@@ -94,7 +94,7 @@ https://rubyforge.org/frs/?group_id=6124
             # args: <entry name>,      <source>
     end
 
-=== modifying zip archives
+=== modifying zip archive
 
     require 'zipruby'
     
@@ -130,10 +130,14 @@ https://rubyforge.org/frs/?group_id=6124
       end
     end
 
-=== decrypt zip archives
+=== encrypt/decrypt zip archive
 
     require 'zipruby'
     
+    # encrypt
+    Zip::Archive.encrypt('filename.zip', 'password')
+    
+    # decrypt
     Zip::Archive.decrypt('filename.zip', 'password')
 
 == License

data/ext/zip.h

@@ -206,6 +206,7 @@ int zip_unchange_archive(struct zip *);
 
 // modified for Zip/Ruby by SUGAWARA Genki <sgwr_dts@yahoo.co.jp>
 int zip_decrypt(const char *path, const char *pwd, int pwdlen, int *errorp, int *wrongpwd);
+int zip_encrypt(const char *path, const char *pwd, int pwdlen, int *errorp);
 
 #ifdef __cplusplus
 }

data/ext/zip_crypt.c

@@ -56,7 +56,6 @@ static void init_keys(uLong *keys, const char *password, size_t len) {
 static int decrypt_header(unsigned long *keys, char *buffer, struct zip_dirent *de) {
   int i;
   char c;
-  unsigned short dostime, dosdate;
 
   for (i = 0; i < ZIPENC_HEAD_LEN; i++) {
     c = buffer[i] ^ decrypt_byte(keys);
@@ -64,11 +63,11 @@ static int decrypt_header(unsigned long *keys, char *buffer, struct zip_dirent *
     buffer[i] = c;
   }
 
-  _zip_u2d_time(de->last_mod, &dostime, &dosdate);
-
   if (de->bitflags & ZIP_GPBF_DATA_DESCRIPTOR) {
     return ((c & 0xff) == (de->crc >> 24)) ? 0 : -1;
   } else {
+    unsigned short dostime, dosdate;
+    _zip_u2d_time(de->last_mod, &dostime, &dosdate);
     return ((c & 0xff) == (dostime >> 8)) ? 0 : -1;
   }
 }
@@ -128,6 +127,97 @@ static int copy_decrypt(FILE *src, off_t len, const char *pwd, int pwdlen, struc
   return 0;
 }
 
+static void generate_random_header(unsigned long *keys, char *buffer) {
+  static int initialized = 0;
+  int i;
+
+  if (!initialized) {
+    srand((unsigned) time(NULL));
+    initialized = 1;
+  }
+
+  for (i = 0; i < ZIPENC_HEAD_LEN - 2; i++) {
+    char temp = decrypt_byte(keys);
+    char c = rand() % 0xff;
+    update_keys(keys, c);
+    buffer[i] = temp ^ c;
+  }
+}
+
+static void encrypt_header(unsigned long *keys, char *buffer, struct zip_dirent *de) {
+  int i;
+  char c, temp;
+
+  for (i = 0; i < ZIPENC_HEAD_LEN - 2; i++) {
+    temp = decrypt_byte(keys);
+    c = buffer[i];
+    update_keys(keys, c);
+    buffer[i] = temp ^ c;
+  }
+
+  temp = decrypt_byte(keys);
+  c = (de->crc >> 16) & 0xff;
+  update_keys(keys, c);
+  buffer[ZIPENC_HEAD_LEN - 2] = temp ^ c;
+
+  temp = decrypt_byte(keys);
+  c = (de->crc >> 24) & 0xff;
+  update_keys(keys, c);
+  buffer[ZIPENC_HEAD_LEN - 1] = temp ^ c;
+}
+
+static void encrypt_data(uLong *keys, char *buffer, size_t n) {
+  int i;
+
+  for (i = 0; i < n; i++) {
+    char temp = decrypt_byte(keys);
+    char c = buffer[i];
+    update_keys(keys, c);
+    buffer[i] = temp ^ c;
+  }
+}
+
+static int copy_encrypt(FILE *src, off_t len, const char *pwd, int pwdlen, struct zip_dirent *de, FILE *dest, struct zip_error *error) {
+  char header[ZIPENC_HEAD_LEN];
+  char buf[BUFSIZE];
+  uLong keys[3];
+  int n;
+
+  if (len == 0) {
+    return 0;
+  }
+
+  init_keys(keys, pwd, pwdlen);
+  generate_random_header(keys, header);
+  init_keys(keys, pwd, pwdlen);
+  encrypt_header(keys, header, de);
+
+  if (fwrite(header, 1, ZIPENC_HEAD_LEN, dest) != ((size_t) ZIPENC_HEAD_LEN)) {
+    _zip_error_set(error, ZIP_ER_WRITE, errno);
+  }
+
+  while (len > 0) {
+    if ((n = fread(buf, 1, MIN(len,  sizeof(buf)), src)) < 0) {
+      _zip_error_set(error, ZIP_ER_READ, errno);
+      return -1;
+    } else if (n == 0) {
+      _zip_error_set(error, ZIP_ER_EOF, 0);
+      return -1;
+    }
+
+    encrypt_data(keys, buf, n);
+
+    if (fwrite(buf, 1, n, dest) != ((size_t) n)) {
+      _zip_error_set(error, ZIP_ER_WRITE, errno);
+      return -1;
+    }
+
+    len -= n;
+  }
+
+  return 0;
+}
+
 static int _zip_crypt(struct zip *za, const char *pwd, int pwdlen, int decrypt, int *wrongpwd) {
   int i, error = 0;
   char *temp;
@@ -202,7 +292,10 @@ static int _zip_crypt(struct zip *za, const char *pwd, int pwdlen, int decrypt,
       cd->entry[i].comp_size -= ZIPENC_HEAD_LEN;
       cd->entry[i].bitflags &= ~ZIP_GPBF_ENCRYPTED;
     } else if (!decrypt && !encrypted) {
-      // XXX
+      de.comp_size += ZIPENC_HEAD_LEN;
+      de.bitflags |= ZIP_GPBF_ENCRYPTED;
+      cd->entry[i].comp_size += ZIPENC_HEAD_LEN;
+      cd->entry[i].bitflags |= ZIP_GPBF_ENCRYPTED;
     }
 
     if (_zip_dirent_write(&de, out, 1, &za->error) < 0) {
@@ -213,8 +306,7 @@ static int _zip_crypt(struct zip *za, const char *pwd, int pwdlen, int decrypt,
     if (decrypt && encrypted) {
       error = (copy_decrypt(za->zp, cd->entry[i].comp_size, pwd, pwdlen, &de, out, &za->error, wrongpwd) < 0);
     } else if (!decrypt && !encrypted) {
-      // XXX
-      error = (copy_data(za->zp, cd->entry[i].comp_size, out, &za->error) < 0);
+      error = (copy_encrypt(za->zp, (cd->entry[i].comp_size - ZIPENC_HEAD_LEN), pwd, pwdlen, &de, out, &za->error) < 0);
     } else {
       error = (copy_data(za->zp, cd->entry[i].comp_size, out, &za->error) < 0);
     }
@@ -293,3 +385,21 @@ int zip_decrypt(const char *path, const char *pwd, int pwdlen, int *errorp, int
 
   return res;
 }
+
+int zip_encrypt(const char *path, const char *pwd, int pwdlen, int *errorp) {
+  struct zip *za;
+  int res;
+
+  if (pwd == NULL || pwdlen < 1) {
+    return -1;
+  }
+
+  if ((za = zip_open(path, 0, errorp)) == NULL) {
+    return -1;
+  }
+
+  res = _zip_crypt(za, pwd, pwdlen, 0, NULL);
+  _zip_free(za);
+
+  return res;
+}

data/ext/zipruby.h

@@ -1,7 +1,7 @@
 #ifndef __ZIPRUBY_H__
 #define __ZIPRUBY_H__
 
-#define VERSION "0.2.1"
+#define VERSION "0.2.2"
 #define ERRSTR_BUFSIZE 256
 #define DATA_BUFSIZE 8192
 

data/ext/zipruby_archive.c

@@ -10,6 +10,7 @@ static VALUE zipruby_archive_alloc(VALUE klass);
 static void zipruby_archive_free(struct zipruby_archive *p);
 static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password);
+static VALUE zipruby_archive_s_encrypt(VALUE self, VALUE path, VALUE password);
 static VALUE zipruby_archive_close(VALUE self);
 static VALUE zipruby_archive_num_files(VALUE self);
 static VALUE zipruby_archive_get_name(int argc, VALUE *argv, VALUE self);
@@ -50,6 +51,7 @@ void Init_zipruby_archive() {
   rb_include_module(Archive, rb_mEnumerable);
   rb_define_singleton_method(Archive, "open", zipruby_archive_s_open, -1);
   rb_define_singleton_method(Archive, "decrypt", zipruby_archive_s_decrypt, 2);
+  rb_define_singleton_method(Archive, "encrypt", zipruby_archive_s_encrypt, 2);
   rb_define_method(Archive, "close", zipruby_archive_close, 0);
   rb_define_method(Archive, "num_files", zipruby_archive_num_files, 0);
   rb_define_method(Archive, "get_name", zipruby_archive_get_name, -1);
@@ -138,11 +140,19 @@ static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
 /* */
 static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password) {
   int errorp, wrongpwd;
+  long pwdlen;
 
   Check_Type(path, T_STRING);
   Check_Type(password, T_STRING);
+  pwdlen = RSTRING(password)->len;
 
-  if (zip_decrypt(StringValuePtr(path), StringValuePtr(password), RSTRING(password)->len, &errorp, &wrongpwd) == -1) {
+  if (pwdlen < 1) {
+    rb_raise(Error, "Decrypt archive failed - %s: Password is empty", StringValuePtr(path));
+  } else if (pwdlen > 0xff) {
+    rb_raise(Error, "Decrypt archive failed - %s: Password is too long", StringValuePtr(path));
+  }
+
+  if (zip_decrypt(StringValuePtr(path), StringValuePtr(password), pwdlen, &errorp, &wrongpwd) == -1) {
     if (wrongpwd) {
       rb_raise(Error, "Decrypt archive failed - %s: Wrong password", StringValuePtr(path));
     } else {
@@ -155,6 +165,30 @@ static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password) {
   return Qnil;
 }
 
+/* */
+static VALUE zipruby_archive_s_encrypt(VALUE self, VALUE path, VALUE password) {
+  int errorp;
+  long pwdlen;
+
+  Check_Type(path, T_STRING);
+  Check_Type(password, T_STRING);
+  pwdlen = RSTRING(password)->len;
+
+  if (pwdlen < 1) {
+    rb_raise(Error, "Encrypt archive failed - %s: Password is empty", StringValuePtr(path));
+  } else if (pwdlen > 0xff) {
+    rb_raise(Error, "Encrypt archive failed - %s: Password is too long", StringValuePtr(path));
+  }
+
+  if (zip_encrypt(StringValuePtr(path), StringValuePtr(password), pwdlen, &errorp) == -1) {
+    char errstr[ERRSTR_BUFSIZE];
+    zip_error_to_str(errstr, ERRSTR_BUFSIZE, errorp, errno);
+    rb_raise(Error, "Encrypt archive failed - %s: %s", StringValuePtr(path), errstr);
+  }
+
+  return Qnil;
+}
+
 /* */
 static VALUE zipruby_archive_close(VALUE self) {
   struct zipruby_archive *p_archive;

data/ext/zipruby_file.c

@@ -7,6 +7,7 @@
 #endif
 
 #include "zip.h"
+#include "zipint.h"
 #include "zipruby.h"
 #include "zipruby_archive.h"
 #include "zipruby_file.h"
@@ -178,6 +179,10 @@ static VALUE zipruby_file_read(int argc, VALUE *argv, VALUE self) {
   Check_File(p_file);
   zip_stat_init(&sb);
 
+  if (p_file->archive->cdir->entry[0].bitflags & ZIP_GPBF_ENCRYPTED) {
+    rb_raise(Error, "Read file failed: File encrypted");
+  }
+
   if (zip_stat_index(p_file->archive, p_file->sb->index, 0, &sb)) {
     rb_raise(Error, "Read file failed: %s", zip_strerror(p_file->archive));
   }

data/zipruby.c

@@ -29,6 +29,7 @@ static VALUE zipruby_archive_alloc(VALUE klass);
 static void zipruby_archive_free(struct zipruby_archive *p);
 static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self);
 static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password);
+static VALUE zipruby_archive_s_encrypt(VALUE self, VALUE path, VALUE password);
 static VALUE zipruby_archive_close(VALUE self);
 static VALUE zipruby_archive_num_files(VALUE self);
 static VALUE zipruby_archive_get_name(int argc, VALUE *argv, VALUE self);
@@ -69,6 +70,7 @@ void Init_zipruby_archive() {
   rb_include_module(Archive, rb_mEnumerable);
   rb_define_singleton_method(Archive, "open", zipruby_archive_s_open, -1);
   rb_define_singleton_method(Archive, "decrypt", zipruby_archive_s_decrypt, 2);
+  rb_define_singleton_method(Archive, "encrypt", zipruby_archive_s_encrypt, 2);
   rb_define_method(Archive, "close", zipruby_archive_close, 0);
   rb_define_method(Archive, "num_files", zipruby_archive_num_files, 0);
   rb_define_method(Archive, "get_name", zipruby_archive_get_name, -1);
@@ -157,11 +159,19 @@ static VALUE zipruby_archive_s_open(int argc, VALUE *argv, VALUE self) {
 /* */
 static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password) {
   int errorp, wrongpwd;
+  long pwdlen;
 
   Check_Type(path, T_STRING);
   Check_Type(password, T_STRING);
+  pwdlen = RSTRING(password)->len;
 
-  if (zip_decrypt(StringValuePtr(path), StringValuePtr(password), RSTRING(password)->len, &errorp, &wrongpwd) == -1) {
+  if (pwdlen < 1) {
+    rb_raise(Error, "Decrypt archive failed - %s: Password is empty", StringValuePtr(path));
+  } else if (pwdlen > 0xff) {
+    rb_raise(Error, "Decrypt archive failed - %s: Password is too long", StringValuePtr(path));
+  }
+
+  if (zip_decrypt(StringValuePtr(path), StringValuePtr(password), pwdlen, &errorp, &wrongpwd) == -1) {
     if (wrongpwd) {
       rb_raise(Error, "Decrypt archive failed - %s: Wrong password", StringValuePtr(path));
     } else {
@@ -174,6 +184,30 @@ static VALUE zipruby_archive_s_decrypt(VALUE self, VALUE path, VALUE password) {
   return Qnil;
 }
 
+/* */
+static VALUE zipruby_archive_s_encrypt(VALUE self, VALUE path, VALUE password) {
+  int errorp;
+  long pwdlen;
+
+  Check_Type(path, T_STRING);
+  Check_Type(password, T_STRING);
+  pwdlen = RSTRING(password)->len;
+
+  if (pwdlen < 1) {
+    rb_raise(Error, "Encrypt archive failed - %s: Password is empty", StringValuePtr(path));
+  } else if (pwdlen > 0xff) {
+    rb_raise(Error, "Encrypt archive failed - %s: Password is too long", StringValuePtr(path));
+  }
+
+  if (zip_encrypt(StringValuePtr(path), StringValuePtr(password), pwdlen, &errorp) == -1) {
+    char errstr[ERRSTR_BUFSIZE];
+    zip_error_to_str(errstr, ERRSTR_BUFSIZE, errorp, errno);
+    rb_raise(Error, "Encrypt archive failed - %s: %s", StringValuePtr(path), errstr);
+  }
+
+  return Qnil;
+}
+
 /* */
 static VALUE zipruby_archive_close(VALUE self) {
   struct zipruby_archive *p_archive;
@@ -845,6 +879,7 @@ void Init_zipruby_error() {
 #endif
 
 #include "zip.h"
+#include "zipint.h"
 #include "zipruby.h"
 #include "zipruby_archive.h"
 #include "zipruby_file.h"
@@ -1016,6 +1051,10 @@ static VALUE zipruby_file_read(int argc, VALUE *argv, VALUE self) {
   Check_File(p_file);
   zip_stat_init(&sb);
 
+  if (p_file->archive->cdir->entry[0].bitflags & ZIP_GPBF_ENCRYPTED) {
+    rb_raise(Error, "Read file failed: File encrypted");
+  }
+
   if (zip_stat_index(p_file->archive, p_file->sb->index, 0, &sb)) {
     rb_raise(Error, "Read file failed: %s", zip_strerror(p_file->archive));
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zipruby
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - winebarrel