node-marshal 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bed8bdc507d12d26f9b1ed0eb8c969fc05853e3
-  data.tar.gz: ebc554d61f17751f7033c1c666375f383e9cb5c5
+  metadata.gz: 1f8bf24b07c3adc1df9e6f12ab148f7428fee811
+  data.tar.gz: fa00130d6340112f071c2fc677f3684ecef18447
 SHA512:
-  metadata.gz: 2d7c90c64e183b195ebbe6d12ea6f9af7d75ce54955e93b667b1ccbc9a22cc4807a1623c4c3eb0134a044af1c21f4aa94865878f7a93879b250f0d8928357e63
-  data.tar.gz: f25344c304ef5786fd44fc50f14afc177b30698b4db00c2a12055707e10ae8964e7aa6a5d84d1c92877d7a0a418fd779032a5e281d3437adfd1c6493ffcb4cc5
+  metadata.gz: 64357a5c91bc8fc0f523683c1a8d83a83d7b112bff8d46bbecf0446249b94c03e9243361e11d5926ed772ca7599a6ae465a88cbd8d59ffd641a858ef3fea786d
+  data.tar.gz: 1707659e29f48e9ad3996ded44fcac8e622edaa7a6bed3d48f05a5e5231e6c6647a6fe6bea2705973289032d8a5a783c562db0fb77f7178f2746fa1a09e26b37

data/COPYING

@@ -1,23 +1,23 @@
-Copyright (C) 2015-2016 Alexey Voskov. All rights reserved.
-Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
+Copyright (C) 2015-2017 Alexey Voskov. All rights reserved.
+Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

data/README.rdoc

@@ -1,49 +1,56 @@
-== node-marshal
-
-This gem is designed for transformation of Ruby source code (eiher in the form of files or strings) to the 
-Ruby nodes (syntax trees) used by Ruby MRI internals. Obtained nodes can be serialized to the platform-dependent
-binary or ASCII strings and restored and launched from serialized format. Such kind of transformation is
-irreversible and can be used for source code protection; the similar principle is used by RubyEncoder commercial
-software. It also contains some subroutines that can be useful for code obfuscation by renaming symbols
-inside the program.
-
-The key features of node-marshal gem:
-- Irreversible conversion of a source code to the Ruby node (abstract syntax tree)
-- Ruby 1.9.3, 2.2.x and 2.3.x support (only MRI)
-- Active usage of Ruby internals (mainly AST) and Ruby standard library (Marshal and Zlib)
-- Set of tests for easy addition of new Ruby versions
-- Result of compilation depends on Ruby version and used platform (x86, x64 etc.)
-- Subroutines for obfuscation
-- 2-clause BSD license suitable for creation of custom source code protection system
-
-Changelog:
-- 16.MAR.2016 - 0.2.1
-      - Bugfix: garbage collection of symbols kept in the literals table of the node dump
-        is now prohibited. Such GC caused hardly reproducible bugs after code loading.
-        (thanks to Gregory Siehień for suitable examples)
-      - Bugfix: improved parsing of NODE_ARRAY (correct processing of two cases of
-        not documented pointers (instead of longs) in 2nd child. It affects arrays,
-        NODE_HASH (hashes) and NODE_DSTR (strings in double quotes with #{} inside) ).
-      - Bugfix: now NodeMarshal class methods don't change the state of Ruby 
-        garbage collector
-      - Improved NodeMarshal#dump_tree_short output (addresses of nodes are shown)
-      - Added NodeMarshal#to_h method (alias for NodeMarshal#to_hash)
-      - NodeMarshal#to_a and NodeMarshal#to_ary methods added (they show extended information
-        about Ruby AST including rb_args_info and ID *tbl internals)
-- 11.JAN.2016 - 0.2.0
-      - Bugfix: || and && in NODE_OP_ASGN1 (e.g. in x['a'] ||= 'b' or x['b'] &&= false)
-        (this bug caused segfaults in some cases)
-      - Bugfix: NodeMarshal#dump_node_short
-      - Format version changed to NODEMARSHAL11 (support of symbols not representable in
-        the form of String is added)
-      - show_offsets property for controlling verbosity of NodeMarshal#dump_node_short output
-      - Improved information about licenses
-      - Improved rdoc documentation
-- 24.DEC.2015 - 0.1.2
-      - Ruby 2.3.x preliminary support (including &. safe navigation operator)
-      - Bugfix: NODE_MATCH3 (a =~ /abc/) issue (reported by Gregory Siehień)
-      - Bugfix: NODE_BLOCK_PASS (short map syntax) issue (reported by Gregory Siehień)
-      - Bugfix: failure in the case of syntax errors in the input data (now ArgumentError
-        exception will be generated instead of it)
-      - Ability of symbols renaming (for hiding variables and constants name during code obfuscation)
-- 04.MAY.2015 - 0.1.1 - first public version
+== node-marshal
+
+This gem is designed for transformation of Ruby source code (eiher in the form of files or strings) to the 
+Ruby nodes (syntax trees) used by Ruby MRI internals. Obtained nodes can be serialized to the platform-dependent
+binary or ASCII strings and restored and launched from serialized format. Such kind of transformation is
+irreversible and can be used for source code protection; the similar principle is used by RubyEncoder commercial
+software. It also contains some subroutines that can be useful for code obfuscation by renaming symbols
+inside the program.
+
+The key features of node-marshal gem:
+- Irreversible conversion of a source code to the Ruby node (abstract syntax tree)
+- Ruby 1.9.3, 2.2.x and 2.3.x support (only MRI)
+- Active usage of Ruby internals (mainly AST) and Ruby standard library (Marshal and Zlib)
+- Set of tests for easy addition of new Ruby versions
+- Result of compilation depends on Ruby version and used platform (x86, x64 etc.)
+- Subroutines for obfuscation
+- 2-clause BSD license suitable for creation of custom source code protection system
+
+Changelog:
+- 01.MAY.2017 - 0.2.2
+      - Bugfix: NODE_KW_ARG processing implementation. Allows to use keyword (named) arguments
+        in Ruby 2.x. (thanks to Jarosław Salik for bugreport).
+      - Bugfix: NODE_LASGN and NODE_DASGN_CURR 2nd child special cases (-1 value). Mainly for
+        their usage inside NODE_KW_ARG child trees.
+      - test_namedarg.rb test was added (for so called keyword argument)
+      - Improved output of dump_tree_short (rb_args_info dump)
+- 16.MAR.2016 - 0.2.1
+      - Bugfix: garbage collection of symbols kept in the literals table of the node dump
+        is now prohibited. Such GC caused hardly reproducible bugs after code loading.
+        (thanks to Gregory Siehień for suitable examples)
+      - Bugfix: improved parsing of NODE_ARRAY (correct processing of two cases of
+        not documented pointers (instead of longs) in 2nd child. It affects arrays,
+        NODE_HASH (hashes) and NODE_DSTR (strings in double quotes with #{} inside) ).
+      - Bugfix: now NodeMarshal class methods don't change the state of Ruby 
+        garbage collector
+      - Improved NodeMarshal#dump_tree_short output (addresses of nodes are shown)
+      - Added NodeMarshal#to_h method (alias for NodeMarshal#to_hash)
+      - NodeMarshal#to_a and NodeMarshal#to_ary methods added (they show extended information
+        about Ruby AST including rb_args_info and ID *tbl internals)
+- 11.JAN.2016 - 0.2.0
+      - Bugfix: || and && in NODE_OP_ASGN1 (e.g. in x['a'] ||= 'b' or x['b'] &&= false)
+        (this bug caused segfaults in some cases)
+      - Bugfix: NodeMarshal#dump_node_short
+      - Format version changed to NODEMARSHAL11 (support of symbols not representable in
+        the form of String is added)
+      - show_offsets property for controlling verbosity of NodeMarshal#dump_node_short output
+      - Improved information about licenses
+      - Improved rdoc documentation
+- 24.DEC.2015 - 0.1.2
+      - Ruby 2.3.x preliminary support (including &. safe navigation operator)
+      - Bugfix: NODE_MATCH3 (a =~ /abc/) issue (reported by Gregory Siehień)
+      - Bugfix: NODE_BLOCK_PASS (short map syntax) issue (reported by Gregory Siehień)
+      - Bugfix: failure in the case of syntax errors in the input data (now ArgumentError
+        exception will be generated instead of it)
+      - Ability of symbols renaming (for hiding variables and constants name during code obfuscation)
+- 04.MAY.2015 - 0.1.1 - first public version

data/bin/noderbc

@@ -1,63 +1,63 @@
-#!/usr/bin/ruby
-require_relative '../lib/node-marshal.rb'
-
-help = <<-EOS
-Ruby source files compiler from node-marshal gem. It is based
-on NodeMarshal class. Source code is irreversibly transformed to the 
-Ruby node (syntax tree) serialized into ASCII string. It can be used
-for code obfuscation and Ruby internals exploration.
-
-(C) 2015-2016 Alexey Voskov. License: BSD-2-Clause.
-
-Usage:
-  noderbc inpfile outfile [options]
-
-  Required arguments:  
-    inpfile -- Name of input Ruby script (with extension)
-    outfile -- Name of output Ruby (with extension)
-
-  Options:
-    --compress=none -- No ZLib compression of the source
-    --compress=zlib -- Use ZLib compression of the source (default)
-    --so_path="str" -- String for inclusion of the node-marshal loader
-      Its default value is:
-        require_relative '../ext/node-marshal/nodemarshal.so'
-  
-EOS
-
-if ARGV.length < 2
-	# No required number of input arguments: show short help
-	puts help
-else
-	# Optional arguments processing
-	opts = {}
-	if ARGV.length > 2
-		ARGV[2..-1].each do |arg|
-			case arg
-			when '--compress=none'
-				opts[:compress] = false
-			when '--compress=zlib'
-				opts[:compress] = true
-			when /^--so_path=.+$/
-				str = arg[10..-1]
-				opts[:so_path] = str
-			else
-				puts "Unknown argument #{arg}"
-				exit
-			end
-		end
-	end
-	# Show given options
-	puts "Used options:"
-	if opts.size == 0
-		puts "  default"
-	else
-		puts "  compress: #{opts[:compress]}" if opts.has_key?(:compress)
-		puts "  so_path:  #{opts[:so_path]}" if opts.has_key?(:so_path)
-	end
-	# Required arguments processing
-	inpfile = ARGV[0]
-	outfile = ARGV[1]
-	raise 'inpfile and outfile cannot be equal' if inpfile == outfile
-	NodeMarshal.compile_rb_file(outfile, inpfile, opts)
-end
+#!/usr/bin/ruby
+require_relative '../lib/node-marshal.rb'
+
+help = <<-EOS
+Ruby source files compiler from node-marshal gem. It is based
+on NodeMarshal class. Source code is irreversibly transformed to the 
+Ruby node (syntax tree) serialized into ASCII string. It can be used
+for code obfuscation and Ruby internals exploration.
+
+(C) 2015-2016 Alexey Voskov. License: BSD-2-Clause.
+
+Usage:
+  noderbc inpfile outfile [options]
+
+  Required arguments:  
+    inpfile -- Name of input Ruby script (with extension)
+    outfile -- Name of output Ruby (with extension)
+
+  Options:
+    --compress=none -- No ZLib compression of the source
+    --compress=zlib -- Use ZLib compression of the source (default)
+    --so_path="str" -- String for inclusion of the node-marshal loader
+      Its default value is:
+        require_relative '../ext/node-marshal/nodemarshal.so'
+  
+EOS
+
+if ARGV.length < 2
+	# No required number of input arguments: show short help
+	puts help
+else
+	# Optional arguments processing
+	opts = {}
+	if ARGV.length > 2
+		ARGV[2..-1].each do |arg|
+			case arg
+			when '--compress=none'
+				opts[:compress] = false
+			when '--compress=zlib'
+				opts[:compress] = true
+			when /^--so_path=.+$/
+				str = arg[10..-1]
+				opts[:so_path] = str
+			else
+				puts "Unknown argument #{arg}"
+				exit
+			end
+		end
+	end
+	# Show given options
+	puts "Used options:"
+	if opts.size == 0
+		puts "  default"
+	else
+		puts "  compress: #{opts[:compress]}" if opts.has_key?(:compress)
+		puts "  so_path:  #{opts[:so_path]}" if opts.has_key?(:so_path)
+	end
+	# Required arguments processing
+	inpfile = ARGV[0]
+	outfile = ARGV[1]
+	raise 'inpfile and outfile cannot be equal' if inpfile == outfile
+	NodeMarshal.compile_rb_file(outfile, inpfile, opts)
+end

data/ext/node-marshal/base85r.c

@@ -1,194 +1,194 @@
-/*
- * Implementation of own version of BASE85 binary data encoding
- * adapted for the usage inside Ruby source code (i.e. without
- * such symbols as \ " # { } '
- *
- * Format of the output stream:
- * 1) First byte: number of bytes in the last chunk: from 0 to 3
- *    (0 means that the last chunk contains 4 bytes, i.e. everything
- *     is aligned). See val_to_char array for the used alphabet
- * 2) big-endian 5-byte numbers (base 85)
- * 3) empty string: arbitrary two bytes
- *
- * (C) 2015-2016 Alexey Voskov
- * License: BSD-2-Clause
- */
-#include <stdio.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <ruby.h>
-#include <ruby/version.h>
-
-#define BASE85R_STR_WIDTH 14 // Number of 5-byte groups in the string (12 for 60-byte string)
-
-#define D0_VAL 1 // 85**0
-#define D1_VAL 85 // 85**1
-#define D2_VAL 7225 // 85**2
-#define D3_VAL 614125 // 85**3
-#define D4_VAL 52200625 // 85**4
-
-static int di_val[5] = {D4_VAL, D3_VAL, D2_VAL, D1_VAL, D0_VAL};
-
-
-/* Modified BASE85 digits */
-static const char val_to_char[86] = // ASCIIZ string
-"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-"abcdefghijklmnopqrstuvwxyz"
-"0123456789"
-"!$%&()*-./"
-":;<=>?@[]^"
-",_|";
-
-static int char_to_val[128];
-
-
-/* Initializes internal tables that are required
-   for recoding */
-void base85r_init_tables()
-{
-	int i;
-	for (i = 0; i < 128; i++)
-		char_to_val[i] = -1;
-
-
-	for (i = 0; i < 85; i++)
-	{
-		if (char_to_val[(int) val_to_char[i]] != -1)
-			rb_raise(rb_eArgError, "Internal error");
-		char_to_val[(int) val_to_char[i]] = i;
-	}
-
-	for (i = 0; i < 85; i++)
-		if (char_to_val[(int) val_to_char[i]] != i)
-			rb_raise(rb_eArgError, "Internal error");
-}
-
-
-/* Calculate length of buffer for base85 encoding */
-static int base85_encode_buf_len(int len)
-{
-	// Calculate aligned (32-bit alignment) size of the buffer
-	int buf_len = ((len >> 2) << 2);
-	if (len % 4) buf_len += 4;
-	// Calculate size of the output buffer
-	buf_len = (buf_len * 5) / 4;
-	buf_len = (buf_len * 105) / 100;
-	buf_len += 32;
-	// Return buffer size
-	return buf_len;
-}
-
-/* 
- * Encode string to modified BASE85 ASCII.
- * Note: call base85_init_tables before using of this function
- */
-VALUE base85r_encode(VALUE input)
-{
-	VALUE output;
-	int inp_len, out_len, out_buf_len;
-	int pos, outpos;
-	unsigned int val;
-	unsigned char *outptr, *inptr;
-	int i;
-	// Check input data type and allocate string
-	if (TYPE(input) != T_STRING)
-		rb_raise(rb_eArgError, "base85r_encode: input must be a string");
-	inp_len = RSTRING_LEN(input);
-	out_buf_len = base85_encode_buf_len(inp_len);
-	output = rb_str_new(NULL, out_buf_len);
-	// Begin conversion
-	outpos = 0;
-	outptr = (unsigned char *) RSTRING_PTR(output);
-	inptr = (unsigned char *) RSTRING_PTR(input);
-	outptr[outpos++] = 32;
-	outptr[outpos++] = val_to_char[inp_len % 4];
-	out_len = 2;
-	for (pos = 0; pos < inp_len; )
-	{
-		// Get four bytes
-		val = 0;
-		for (i = 24; i >= 0; i -= 8)
-			if (pos < inp_len) val |= inptr[pos++] << i;
-		// And transform them to five bytes
-		for (i = 0; i < 5; i++)
-		{
-			int digit = (val / di_val[i]) % 85;
-			char sym = val_to_char[digit];
-			outptr[outpos++] = sym;
-		}
-		out_len += 5;
-		// Newline addition
-		if (pos % (4 * BASE85R_STR_WIDTH) == 0)
-		{
-			out_len += 2;
-			outptr[outpos++] = 10;
-			outptr[outpos++]= 32;
-		}
-	}
-	// Check the state of memory
-	if (outpos >= out_buf_len)
-		rb_raise(rb_eArgError, "base85r_encode: internal memory error");
-	// Truncate the empty "tail" of the buffer and return the string 
-	return rb_str_resize(output, out_len);
-}
-
-
-/* 
- * Decode string in modified BASE85 ASCII format.
- * Note: call base85_init_tables before using of this function
- */
-VALUE base85r_decode(VALUE input)
-{
-	int inp_len, out_len, pos, shift;
-	unsigned int val = 0;
-	VALUE output;
-	unsigned char *inptr, *outptr;
-	int tail_len, i;
-	// Check input data type and allocate string
-	if (TYPE(input) != T_STRING)
-		rb_raise(rb_eArgError, "base85r_decode: input must be a string");
-	inp_len = RSTRING_LEN(input);
-	if (inp_len < 6 && inp_len != 2)
-	{	// String with 1 or more symbols
-		rb_raise(rb_eArgError, "base85r_decode: input string is too short");
-	}
-	output = rb_str_new(NULL, inp_len);
-	// Begin conversion
-	inptr = (unsigned char *) RSTRING_PTR(input);
-	outptr = (unsigned char *) RSTRING_PTR(output);
-	out_len = 0;
-	tail_len = -1;
-	shift = 0;
-	val = 0;
-	for (pos = 0; pos < inp_len; pos++)
-	{
-		int digit = char_to_val[(int) inptr[pos]];
-		if (digit != -1)
-		{
-			if (tail_len == -1)
-			{
-				tail_len = digit;
-				if (tail_len > 4)
-					rb_raise(rb_eArgError, "base85r_decode: input string is corrupted");
-				continue;
-			}
-			val +=  digit * di_val[shift++]; 
-			if (shift == 5)
-			{
-				for (i = 24; i >= 0; i -= 8)
-					*outptr++ = (val >> i) & 0xFF;
-				shift = 0; val = 0;
-				out_len += 4;
-			}
-		}
-	}
-	// Check if the byte sequence was valid
-	if (shift != 0)
-		rb_raise(rb_eArgError, "base85r_decode: input string is corrupted");
-	// Take into account unaligned "tail"
-	if (tail_len != 0)
-	{
-		out_len -= (4 - tail_len);
-	}
-	return rb_str_resize(output, out_len);
-}
+/*
+ * Implementation of own version of BASE85 binary data encoding
+ * adapted for the usage inside Ruby source code (i.e. without
+ * such symbols as \ " # { } '
+ *
+ * Format of the output stream:
+ * 1) First byte: number of bytes in the last chunk: from 0 to 3
+ *    (0 means that the last chunk contains 4 bytes, i.e. everything
+ *     is aligned). See val_to_char array for the used alphabet
+ * 2) big-endian 5-byte numbers (base 85)
+ * 3) empty string: arbitrary two bytes
+ *
+ * (C) 2015-2016 Alexey Voskov
+ * License: BSD-2-Clause
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <ruby.h>
+#include <ruby/version.h>
+
+#define BASE85R_STR_WIDTH 14 // Number of 5-byte groups in the string (12 for 60-byte string)
+
+#define D0_VAL 1 // 85**0
+#define D1_VAL 85 // 85**1
+#define D2_VAL 7225 // 85**2
+#define D3_VAL 614125 // 85**3
+#define D4_VAL 52200625 // 85**4
+
+static int di_val[5] = {D4_VAL, D3_VAL, D2_VAL, D1_VAL, D0_VAL};
+
+
+/* Modified BASE85 digits */
+static const char val_to_char[86] = // ASCIIZ string
+"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+"abcdefghijklmnopqrstuvwxyz"
+"0123456789"
+"!$%&()*-./"
+":;<=>?@[]^"
+",_|";
+
+static int char_to_val[128];
+
+
+/* Initializes internal tables that are required
+   for recoding */
+void base85r_init_tables()
+{
+	int i;
+	for (i = 0; i < 128; i++)
+		char_to_val[i] = -1;
+
+
+	for (i = 0; i < 85; i++)
+	{
+		if (char_to_val[(int) val_to_char[i]] != -1)
+			rb_raise(rb_eArgError, "Internal error");
+		char_to_val[(int) val_to_char[i]] = i;
+	}
+
+	for (i = 0; i < 85; i++)
+		if (char_to_val[(int) val_to_char[i]] != i)
+			rb_raise(rb_eArgError, "Internal error");
+}
+
+
+/* Calculate length of buffer for base85 encoding */
+static int base85_encode_buf_len(int len)
+{
+	// Calculate aligned (32-bit alignment) size of the buffer
+	int buf_len = ((len >> 2) << 2);
+	if (len % 4) buf_len += 4;
+	// Calculate size of the output buffer
+	buf_len = (buf_len * 5) / 4;
+	buf_len = (buf_len * 105) / 100;
+	buf_len += 32;
+	// Return buffer size
+	return buf_len;
+}
+
+/* 
+ * Encode string to modified BASE85 ASCII.
+ * Note: call base85_init_tables before using of this function
+ */
+VALUE base85r_encode(VALUE input)
+{
+	VALUE output;
+	int inp_len, out_len, out_buf_len;
+	int pos, outpos;
+	unsigned int val;
+	unsigned char *outptr, *inptr;
+	int i;
+	// Check input data type and allocate string
+	if (TYPE(input) != T_STRING)
+		rb_raise(rb_eArgError, "base85r_encode: input must be a string");
+	inp_len = RSTRING_LEN(input);
+	out_buf_len = base85_encode_buf_len(inp_len);
+	output = rb_str_new(NULL, out_buf_len);
+	// Begin conversion
+	outpos = 0;
+	outptr = (unsigned char *) RSTRING_PTR(output);
+	inptr = (unsigned char *) RSTRING_PTR(input);
+	outptr[outpos++] = 32;
+	outptr[outpos++] = val_to_char[inp_len % 4];
+	out_len = 2;
+	for (pos = 0; pos < inp_len; )
+	{
+		// Get four bytes
+		val = 0;
+		for (i = 24; i >= 0; i -= 8)
+			if (pos < inp_len) val |= inptr[pos++] << i;
+		// And transform them to five bytes
+		for (i = 0; i < 5; i++)
+		{
+			int digit = (val / di_val[i]) % 85;
+			char sym = val_to_char[digit];
+			outptr[outpos++] = sym;
+		}
+		out_len += 5;
+		// Newline addition
+		if (pos % (4 * BASE85R_STR_WIDTH) == 0)
+		{
+			out_len += 2;
+			outptr[outpos++] = 10;
+			outptr[outpos++]= 32;
+		}
+	}
+	// Check the state of memory
+	if (outpos >= out_buf_len)
+		rb_raise(rb_eArgError, "base85r_encode: internal memory error");
+	// Truncate the empty "tail" of the buffer and return the string 
+	return rb_str_resize(output, out_len);
+}
+
+
+/* 
+ * Decode string in modified BASE85 ASCII format.
+ * Note: call base85_init_tables before using of this function
+ */
+VALUE base85r_decode(VALUE input)
+{
+	int inp_len, out_len, pos, shift;
+	unsigned int val = 0;
+	VALUE output;
+	unsigned char *inptr, *outptr;
+	int tail_len, i;
+	// Check input data type and allocate string
+	if (TYPE(input) != T_STRING)
+		rb_raise(rb_eArgError, "base85r_decode: input must be a string");
+	inp_len = RSTRING_LEN(input);
+	if (inp_len < 6 && inp_len != 2)
+	{	// String with 1 or more symbols
+		rb_raise(rb_eArgError, "base85r_decode: input string is too short");
+	}
+	output = rb_str_new(NULL, inp_len);
+	// Begin conversion
+	inptr = (unsigned char *) RSTRING_PTR(input);
+	outptr = (unsigned char *) RSTRING_PTR(output);
+	out_len = 0;
+	tail_len = -1;
+	shift = 0;
+	val = 0;
+	for (pos = 0; pos < inp_len; pos++)
+	{
+		int digit = char_to_val[(int) inptr[pos]];
+		if (digit != -1)
+		{
+			if (tail_len == -1)
+			{
+				tail_len = digit;
+				if (tail_len > 4)
+					rb_raise(rb_eArgError, "base85r_decode: input string is corrupted");
+				continue;
+			}
+			val +=  digit * di_val[shift++]; 
+			if (shift == 5)
+			{
+				for (i = 24; i >= 0; i -= 8)
+					*outptr++ = (val >> i) & 0xFF;
+				shift = 0; val = 0;
+				out_len += 4;
+			}
+		}
+	}
+	// Check if the byte sequence was valid
+	if (shift != 0)
+		rb_raise(rb_eArgError, "base85r_decode: input string is corrupted");
+	// Take into account unaligned "tail"
+	if (tail_len != 0)
+	{
+		out_len -= (4 - tail_len);
+	}
+	return rb_str_resize(output, out_len);
+}