xmldsign 0.1.5 → 0.1.6

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MTljM2IyNjczYTFjODk0MmI0MWM0NjBkZTc0YjYwMDRiZTFlZTA2Nw==
+  data.tar.gz: !binary |-
+    MDM2MWIzMzdmNzZhMGY4ZDM4NWU5NmQ4ZDE1MGExMDNiZmU5N2ZkNA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YTNiZTg3YjdkZDE2ZWI4NDk0M2E5Yjc5MzI0MDEwZGM2NWU1Mjc0YTljOTU3
+    OGE3MmQxZjBiMzc2YzkyNTdkNzg2MmI2YzI5MmIwY2Q0MDgwZmRhZDI5N2Nl
+    MGYwYjgwZGJlYTg1ZTU5MjM5ODhlNmZhNmNlNDQ3MGU1MTM2MWY=
+  data.tar.gz: !binary |-
+    MjdlNjAyNDdhNGM5NmI4ZWFhNWFmODlmOTA4YjE1YjM5NzAzMjM3ZWVmYWFk
+    ZDVhOTRhNmI5NTFkYmZiNDg2MDk3YzhkNmMyMTc1NzI1NGI3NDA2MTFmZjQw
+    ZjhjNDc3YjM0MmEzZWUyNjk4NWZlYmU0MzY1NGY4MGMwMzY4Mjg=

data/ext/xmldsign/gost89.c

@@ -369,7 +369,13 @@ int gost_mac(gost_ctx *ctx,int mac_len,const unsigned char *data,
 		memset(buf2,0,8);
 		memcpy(buf2,data+i,data_len-i);
 		mac_block(ctx,buffer,buf2);
-		}	
+		i+=8;
+		}
+	if (i==8)
+		{
+		memset(buf2,0,8);
+		mac_block(ctx,buffer,buf2);
+		}
 	get_mac(buffer,mac_len,mac);
 	return 1;
 	}
@@ -389,7 +395,13 @@ int gost_mac_iv(gost_ctx *ctx,int mac_len,const unsigned char *iv,const unsigned
 		memset(buf2,0,8);
 		memcpy(buf2,data+i,data_len-i);
 		mac_block(ctx,buffer,buf2);
+		i+=8;
 		}	
+	if (i==8)
+		{
+		memset(buf2,0,8);
+		mac_block(ctx,buffer,buf2);
+		}
 	get_mac(buffer,mac_len,mac);
 	return 1;
 	}

data/ext/xmldsign/gosthash.c

@@ -12,7 +12,7 @@
 #include "gosthash.h"
 
 
-/* Use OPENSSL_malloc for memory allocation if compiled with
+/* Use OPENSSL_malloc for memory allocation if compiled with 
  * -DOPENSSL_BUILD, and libc malloc otherwise
  */
 #ifndef MYALLOC
@@ -27,27 +27,28 @@
 #endif
 /* Following functions are various bit meshing routines used in
  * GOST R 34.11-94 algorithms */
-static void swap_bytes (byte *w, byte *k)
+static void swap_bytes (byte *w, byte *k) 
 	{
 	int i,j;
-	for (i=0;i<4;i++)
-		for (j=0;j<8;j++)
+	for (i=0;i<4;i++)	
+		for (j=0;j<8;j++) 
 			k[i+4*j]=w[8*i+j];
+
 	}
 
 /* was A_A */
-static void circle_xor8 (const byte *w, byte *k)
+static void circle_xor8 (const byte *w, byte *k) 
 	{
 	byte buf[8];
 	int i;
 	memcpy(buf,w,8);
-	memcpy(k,w+8,24);
+	memmove(k,w+8,24);
 	for(i=0;i<8;i++)
 		k[i+24]=buf[i]^k[i];
 	}
 
 /* was R_R */
-static void transform_3 (byte *data)
+static void transform_3 (byte *data) 
 	{
 	unsigned short int acc;
 	acc=(data[0]^data[2]^data[4]^data[6]^data[24]^data[30])|
@@ -58,32 +59,32 @@ static void transform_3 (byte *data)
 	}
 
 /* Adds blocks of N bytes modulo 2**(8*n). Returns carry*/
-static int add_blocks(int n,byte *left, const byte *right)
+static int add_blocks(int n,byte *left, const byte *right) 
 	{
 	int i;
 	int carry=0;
 	int sum;
-	for (i=0;i<n;i++)
+	for (i=0;i<n;i++) 
 		{
 	   	sum=(int)left[i]+(int)right[i]+carry;
 		left[i]=sum & 0xff;
 		carry=sum>>8;
 		}
 	return carry;
-	}
+	} 
 
 /* Xor two sequences of bytes */
 static void xor_blocks (byte *result,const byte *a,const byte *b,size_t len)
 	{
 	size_t i;
 	for (i=0;i<len;i++) result[i]=a[i]^b[i];
-	}
+	}	
 
-/*
- * 	Calculate H(i+1) = Hash(Hi,Mi)
+/* 
+ * 	Calculate H(i+1) = Hash(Hi,Mi) 
  * 	Where H and M are 32 bytes long
  */
-static int hash_step(gost_ctx *c,byte *H,const byte *M)
+static int hash_step(gost_ctx *c,byte *H,const byte *M) 
 	{
 	byte U[32],W[32],V[32],S[32],Key[32];
 	int i;
@@ -120,12 +121,12 @@ static int hash_step(gost_ctx *c,byte *H,const byte *M)
 	swap_bytes(W,Key);
 	/* Encrypt last 8 bytes with fourth key */
 	gost_enc_with_key(c,Key,H+24,S+24);
-	for (i=0;i<12;i++)
+	for (i=0;i<12;i++) 
 		transform_3(S);
 	xor_blocks(S,S,M,32);
 	transform_3(S);
 	xor_blocks(S,S,H,32);
-	for (i=0;i<61;i++)
+	for (i=0;i<61;i++) 
 		transform_3(S);
 	memcpy(H,S,32);
 	return 1;
@@ -135,13 +136,13 @@ static int hash_step(gost_ctx *c,byte *H,const byte *M)
  * set up substitution blocks
  */
 int init_gost_hash_ctx(gost_hash_ctx *ctx, const gost_subst_block *subst_block)
-	{
+	{	
 	memset(ctx,0,sizeof(gost_hash_ctx));
 	ctx->cipher_ctx = (gost_ctx *)MYALLOC(sizeof(gost_ctx));
 	if (!ctx->cipher_ctx)
 		{
 		return 0;
-		}
+		}		
 	gost_init(ctx->cipher_ctx,subst_block);
 	return 1;
 	}
@@ -151,8 +152,8 @@ int init_gost_hash_ctx(gost_hash_ctx *ctx, const gost_subst_block *subst_block)
  * if cipher ctx is statically allocated as in OpenSSL implementation of
  * GOST hash algroritm
  *
- */
-void done_gost_hash_ctx(gost_hash_ctx *ctx)
+ */ 
+void done_gost_hash_ctx(gost_hash_ctx *ctx) 
 	{
 	/* No need to use gost_destroy, because cipher keys are not really
 	 * secret when hashing */
@@ -188,13 +189,13 @@ int hash_block(gost_hash_ctx *ctx,const byte *block, size_t length)
 		if (add_bytes>length)
 			{
 			add_bytes = length;
-			}
+			}	
 		memcpy(&(ctx->remainder[ctx->left]),block,add_bytes);
 		ctx->left+=add_bytes;
 		if (ctx->left<32)
 			{
 			return 1;
-			}
+			}	
 		curptr=block+add_bytes;
 		hash_step(ctx->cipher_ctx,ctx->H,ctx->remainder);
 		add_blocks(32,ctx->S,ctx->remainder);
@@ -202,26 +203,26 @@ int hash_block(gost_hash_ctx *ctx,const byte *block, size_t length)
 		ctx->left=0;
 		}
 	while (curptr<=barrier)
-		{
+		{	
 		hash_step(ctx->cipher_ctx,ctx->H,curptr);
-
+			
 		add_blocks(32,ctx->S,curptr);
 		ctx->len+=32;
 		curptr+=32;
-		}
+		}	
 	if (curptr!=block+length)
 		{
 		ctx->left=block+length-curptr;
 		memcpy(ctx->remainder,curptr,ctx->left);
-		}
-	return 1;
+		}	
+	return 1;	
 	}
 
 /*
  * Compute hash value from current state of ctx
  * state of hash ctx becomes invalid and cannot be used for further
  * hashing.
- */
+ */ 
 int finish_hash(gost_hash_ctx *ctx,byte *hashval)
 	{
 	byte buf[32];
@@ -230,7 +231,7 @@ int finish_hash(gost_hash_ctx *ctx,byte *hashval)
 	ghosthash_len fin_len=ctx->len;
 	byte *bptr;
 	memcpy(H,ctx->H,32);
-	memmove(S,ctx->S,32);
+	memcpy(S,ctx->S,32);
 	if (ctx->left)
 		{
 		memset(buf,0,32);

data/lib/xmldsign/version.rb

@@ -1,3 +1,3 @@
 module Xmldsign
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,128 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: xmldsign
 version: !ruby/object:Gem::Version
-  version: 0.1.5
-  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors:
 - Anton Sozontov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-12 00:00:00.000000000 Z
+date: 2013-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
   name: libxml-ruby
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: libxslt-ruby
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: libxslt-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: rake-compiler
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
+        version: 0.7.7
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.7
   type: :development
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.7
-- !ruby/object:Gem::Dependency
-  name: rake
+        version: 0.8.7
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
-- !ruby/object:Gem::Dependency
-  name: rspec
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: pry
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
+- !ruby/object:Gem::Dependency
   prerelease: false
+  name: pry-debugger
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Xmldsign library for ruby with GOST algorithms
 email:
 - a.sozontov@gmail.com
@@ -194,33 +179,26 @@ files:
 - xmldsign.gemspec
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1771735899723035723
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1771735899723035723
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Xmldsign library for ruby with GOST algorithms. Work in progress...
 test_files:
 - spec/assets/act-birth-for-sign.xml