bindings: many improvements

bindings/Makefile

@@ -0,0 +1,49 @@
+MAKE = make
+RUBY = ruby
+PERL = /usr/bin/perl
+DESTDIR =
+PREFIX = /usr/local
+PERL_OPTIMIZE = -O2 -g -Wall
+
+all: configure build test
+configure: configure-ruby configure-perl
+build: build-java build-perl build-ruby
+test: test-java test-perl test-ruby
+install: install-ruby install-perl
+clean: distclean
+
+configure-perl:
+ cd perl && perl Makefile.PL INSTALLDIRS=vendor
+
+configure-ruby:
+ $(RUBY) -C ruby extconf.rb
+
+build-java:
+ $(MAKE) -C java/ jar jar-symlink jni javadoc
+
+build-perl:
+ $(MAKE) -C perl OPTIMIZE="$(PERL_OPTIMIZE)"
+
+build-ruby:
+ $(MAKE) -C ruby
+
+test-java:
+ $(MAKE) -C java test
+
+test-perl:
+ $(MAKE) -C perl test
+
+test-ruby:
+ $(RUBY) -C ruby test_rhash.rb
+
+install-ruby:
+ $(MAKE) -C ruby install DESTDIR=$(DESTDIR) sitedir=$(DESTDIR)/usr/lib/ruby
+
+install-perl:
+ $(MAKE) -C perl install DESTDIR=$(DESTDIR)
+# $(MAKE) -C perl install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) SITEPREFIX=$(PREFIX)
+
+distclean:
+ $(MAKE) -C java distclean
+ [ ! -f ruby/Makefile ] || $(MAKE) -C ruby distclean
+ [ ! -f perl/Makefile ] || $(MAKE) -C perl distclean

bindings/java/Makefile

@@ -23,7 +23,7 @@ JAVADOC = javadoc
 JAVAH = javah
 JAR = jar
 
-VERSION = $(shell sed -e 's/\(.*\)"\(.*\)"\(.*\)/\2/' ../../version.h)
+VERSION = $(shell sed -e 's/.*"\(.*\)".*/\1/' ../../version.h)
 
 JAVASRC_DIR = src
 CSRC_DIR = native
@@ -42,6 +42,9 @@ jar: compile-classes
  mkdir -p $(DEST_DIR)
  $(JAR) cf $(JARFILE) -C $(CLASSES_DIR) org/
 
+jar-symlink:
+ ln -s rhash-$(VERSION).jar $(DEST_DIR)/rhash.jar
+
 compile-classes:
  mkdir -p $(CLASSES_DIR)
  $(JAVAC) -d $(CLASSES_DIR) -sourcepath $(JAVASRC_DIR) `find ${JAVASRC_DIR} -name '*.java'`

bindings/java/native/Makefile

@@ -18,8 +18,10 @@
 
 CC = gcc
 CFLAGS = -g -O2
-LDFLAGS = -lrhash
-ALLCFLAGS = $(CFLAGS) -fPIC
+LIBRHASH_INC =
+LIBRHASH_LD =
+LDFLAGS = -lrhash $(LIBRHASH_LD)
+ALLCFLAGS = $(CFLAGS) $(LIBRHASH_INC) -fPIC
 
 #Platform dependent
 JNI_INCLUDES = /usr/lib/jvm/default-java/include

bindings/perl/MANIFEST

@@ -0,0 +1,7 @@
+Makefile.PL
+Rhash.pm
+Rhash.xs
+t/1test_hash_calculation.t
+t/2test_static_functions.t
+t/3test_all_hash_functions.t
+typemap

bindings/perl/Makefile.PL

@@ -1,16 +1,21 @@
 use strict;
 use warnings;
-
 use ExtUtils::MakeMaker;
 
+my $libs = '-lrhash';
+my $inc = '';
+$inc = $ENV{'LIBRHASH_INC'} if defined($ENV{'LIBRHASH_INC'});
+if(defined($ENV{'LIBRHASH_LD'}) && $ENV{'LIBRHASH_LD'} =~ /^-L/) {
+ $libs = $ENV{'LIBRHASH_LD'} . ' ' . $libs;
+}
+
 # See lib/ExtUtils/MakeMaker.pm for details of how to influence
 # the contents of the Makefile that is written.
 WriteMakefile(
  NAME => 'Rhash',
- AUTHOR  => 'Aleksey Kravchenko',
+ AUTHOR => 'Aleksey Kravchenko',
  VERSION_FROM => 'Rhash.pm', # finds $VERSION
- LIBS => ['-lrhash'],
- DEFINE => '', # e.g., '-DHAVE_SOMETHING'
- INC => '', # e.g., '-I/usr/include/other'
+ LIBS => [ $libs ],
+ DEFINE => '',  # e.g., '-DHAVE_SOMETHING'
+ INC => $inc, # e.g., '-I/usr/include/other'
 );
-

bindings/perl/Rhash.pm

@@ -56,7 +56,6 @@ sub new
  my $context = rhash_init(scalar($hash_id)) or return undef;
  my $self = {
  context => $context,
- finalized => 0
  };
  return bless $self;
 }
@@ -120,15 +119,13 @@ sub final($)
 {
  my $self = shift;
  rhash_final($self->{context});
- $self->{finalized} = 1;
  return $self;
 }
 
 sub reset($)
 {
  my $self = shift;
  rhash_reset($self->{context});
- $self->{finalized} = 0;
  return $self;
 }
 
@@ -161,7 +158,6 @@ sub hash($;$$)
  my $self = shift;
  my $hash_id = scalar(shift) || 0;
  my $print_flags = scalar(shift) || RHPR_DEFAULT;
- $self->final() if !$self->{finalized};
  return rhash_print($self->{context}, $hash_id, $print_flags);
 }
 
@@ -370,11 +366,11 @@ Returns the hash mask, the $rhash object was constructed with.
 
 =head1 FORMATING HASH VALUE
 
-=over
-
 Computed hash can be formated as a hexadecimal string (in the forward or
 reverse byte order), a base32/base64-encoded string or as raw binary data.
 
+=over
+
 =item $rhash->hash( $hash_id )
 
 Returns the hash string in the default format,

bindings/perl/Rhash.xs

@@ -53,7 +53,7 @@ rhash_msg_raw(hash_id, message)
  PROTOTYPE: $$
  PREINIT:
  STRLEN length;
- char out[264];
+ unsigned char out[264];
  int res;
  INPUT:
  char* message = SvPV(ST(1), length);
@@ -63,7 +63,7 @@ rhash_msg_raw(hash_id, message)
  if(res < 0) {
  croak("%s: %s", "rhash_msg_raw", strerror(errno));
  }
- RETVAL = newSVpv(out, rhash_get_digest_size(hash_id));
+ RETVAL = newSVpv((char*)out, rhash_get_digest_size(hash_id));
  OUTPUT:
  RETVAL
 
@@ -74,14 +74,14 @@ rhash_file_raw(hash_id, filepath)
  PROTOTYPE: $$
  PREINIT:
  int res;
- char out[264];
+ unsigned char out[264];
  CODE:
  verify_single_bit_hash_id(hash_id, cv);
  res = rhash_file(hash_id, filepath, out);
  if(res < 0) {
  croak("%s: %s: %s", "rhash_file", filepath, strerror(errno));
  }
- RETVAL = newSVpv(out, rhash_get_digest_size(hash_id));
+ RETVAL = newSVpv((char*)out, rhash_get_digest_size(hash_id));
  OUTPUT:
  RETVAL
 
@@ -220,7 +220,7 @@ raw2hex(bytes)
  PREINIT:
  STRLEN size;
  INPUT:
- unsigned char * bytes = SvPV(ST(0), size);
+ unsigned char * bytes = (unsigned char*)SvPV(ST(0), size);
  CODE:
  RETVAL = allocate_string_buffer(size * 2);
  rhash_print_bytes(SvPVX(RETVAL), bytes, size, RHPR_HEX);
@@ -233,7 +233,7 @@ raw2base32(bytes)
  PREINIT:
  STRLEN size;
  INPUT:
- unsigned char * bytes = SvPV(ST(0), size);
+ unsigned char * bytes = (unsigned char*)SvPV(ST(0), size);
  CODE:
  RETVAL = allocate_string_buffer(BASE32_LENGTH(size));
  rhash_print_bytes(SvPVX(RETVAL), bytes, size, RHPR_BASE32);
@@ -246,7 +246,7 @@ raw2base64(bytes)
  PREINIT:
  STRLEN size;
  INPUT:
- unsigned char * bytes = SvPV(ST(0), size);
+ unsigned char * bytes = (unsigned char*)SvPV(ST(0), size);
  CODE:
  RETVAL = allocate_string_buffer(BASE64_LENGTH(size));
  rhash_print_bytes(SvPVX(RETVAL), bytes, size, RHPR_BASE64);

bindings/ruby/extconf.rb

@@ -1,6 +1,11 @@
 require 'mkmf'
 
-have_header('rhash/rhash.h')
+if ENV['LIBRHASH_INC'] and ENV['LIBRHASH_LD']
+ $CFLAGS += ENV['LIBRHASH_INC']
+ $LDFLAGS += ' ' + ENV['LIBRHASH_LD']
+else
+ have_header('rhash/rhash.h')
+end
 $LDFLAGS += ' -lrhash'
 
 dir_config('rhash')

librhash/rhash.c

@@ -225,6 +225,7 @@ RHASH_API void rhash_reset(rhash ctx)
  assert(info->init != NULL);
  info->init(ectx->vector[i].context);
  }
+ ectx->flags &= ~RCTX_FINALIZED; /* clear finalized state */
 }
 
 /**