cryptopp 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68d183271bac57caacfe1f66a50dad317c4de678
-  data.tar.gz: a87c4ec4a2469fcbc766435b7072e97106b2b2e3
+  metadata.gz: 5e3ca597f024ac6ca96e7e7315ecffa2f93f22f6
+  data.tar.gz: 1622315d9b12c1346b11d4fd5f930037c3a1a29f
 SHA512:
-  metadata.gz: 9a0845962d2279bc631f4212b7a5b2e5ed098216d9fc1af0eed42d47136500986e01baf70e0d1464e9afa889fd684ddc4f9e19487eb4e491abf2046a00691dc5
-  data.tar.gz: 236319c0bf9930ae7b7bb859d534fe55d3e42499adc21271f75cd14b064ea79223fbd2864f4ab223af992fa1fb5df9cd0e25eb87c1e1664f8feff3e632cd4a21
+  metadata.gz: 74768ad9b62fc0d8235d7a4132bb1c0345f366e5b2629c084d5d5d5034db70c7e8a8c03e361329af0867384970c836badfa3db37c27a55b80957c3177cf11a44
+  data.tar.gz: 6544aa80142cd2e62a165bce3377282ace7051d67ced019c125c17c247d0fb4171f0e9b9d537ca9e04beb795cc54d4b7cfe25467d8279d223a71da64246893cc

data/.gitignore

@@ -1,6 +1,8 @@
 ext/*.bundle
 ext/*.o
 ext/extconf.h
+mkmf.log
+lib/
 doc
 *.kpf
 *~

data/.travis.yml

@@ -0,0 +1,13 @@
+cache: bundler
+sudo: false
+language: ruby
+rvm:
+  - 2.4.2
+  - 2.3.5
+  - 2.2.8
+before_script:
+  - bundle exec rake compile
+addons:
+  apt:
+    packages:
+      - libcrypto++-dev

data/Gemfile

@@ -2,11 +2,22 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem "rdoc", "~> 3.12"
-gem "rake", "~> 10.0"
-gem "minitest"
-gem "minitest-reporters"
-gem "guard-minitest"
+gem 'rdoc'
+gem 'rake'
+gem 'minitest'
+gem 'minitest-reporters'
+gem 'rake-compiler'
+
+platforms :rbx do
+  gem 'rubysl', '~> 2.0'
+  gem 'rubinius-developer_tools'
+end
+
+if RUBY_VERSION >= '1.9'
+  gem 'simplecov'
+  gem 'guard'
+  gem 'guard-minitest'
+end
 
 if File.exists?('Gemfile.local')
   instance_eval File.read('Gemfile.local')

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2002-2014 J Smith <dark.panda@gmail.com>
+Copyright (c) 2002-2017 J Smith <dark.panda@gmail.com>
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/Rakefile

@@ -4,6 +4,7 @@
 
 require 'rubygems'
 require 'rubygems/package_task'
+require 'rake/extensiontask'
 require 'rake/testtask'
 require 'rdoc/task'
 require 'bundler/gem_tasks'
@@ -19,6 +20,8 @@ Rake::TestTask.new(:test) do |t|
   t.warning = !!ENV['WARNINGS']
 end
 
+task :default => :test
+
 desc 'Build docs'
 Rake::RDocTask.new do |t|
   t.title = "CryptoPP #{version}"
@@ -33,3 +36,8 @@ Rake::RDocTask.new do |t|
   )
 end
 
+desc 'Compile the extension'
+Rake::ExtensionTask.new 'cryptopp' do |ext|
+  ext.ext_dir = 'ext/'
+end
+

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/ext/cryptopp.cpp

@@ -11,9 +11,9 @@
 #include "config.h"
 #endif
 
+#include "jconfig.h"
 #include "jbase.h"
 #include "jhash.h"
-#include "jconfig.h"
 
 #include "cryptopp_ruby_api.h"
 

data/ext/extconf.rb

@@ -10,7 +10,7 @@ if RbConfig::CONFIG["arch"] =~ /-darwin\d/
   end
 
   CONFIG["CXX"] = "clang++"
-elsif RbConfig::CONFIG["arch"] =~ /x86_64-freebsd/
+elsif RbConfig::CONFIG["arch"] =~ /x86_64-(freebsd|linux)/
   $LDFLAGS << " -fPIC -shared"
 else
   $LDFLAGS << " -shared"
@@ -31,6 +31,8 @@ def error msg
   abort
 end
 
+dir_config('cryptopp')
+
 unless find_library('cryptopp', nil, *%w{
   /usr/local/lib
   /usr/local/lib/cryptopp
@@ -63,19 +65,5 @@ unless find_header('cryptlib.h', *%w{
   error "Can't find cryptlib.h"
 end
 
-have_blocksize = try_link(<<SRC)
-#include "cryptlib.h"
-#include "sha3.h"
-
-int main() {
-  CryptoPP::SHA3_224::BLOCKSIZE;
-  return 0;
-}
-SRC
-
-if have_blocksize
-  $defs << "-DHAVE_CRYPTOPP_SHA3_BLOCKSIZE"
-end
-
 create_makefile('cryptopp')
 

data/ext/jconfig.h

@@ -8,6 +8,7 @@
 #ifndef __JCONFIG_H__
 #define __JCONFIG_H__
 
+#include "dll.h"
 #include "cryptlib.h"
 
 #define ENABLED_THREEWAY_CIPHER                       1
@@ -95,7 +96,6 @@
 #define ENABLED_SHA3_384_HMAC                         1
 #define ENABLED_SHA3_512_HMAC                         1
 #else
-#warning CRYPTOPP_VERSION
 #define ENABLED_SHA3_224_HMAC                         0
 #define ENABLED_SHA3_256_HMAC                         0
 #define ENABLED_SHA3_384_HMAC                         0

data/ext/jexception.h

@@ -9,6 +9,7 @@
 #define __JEXCEPTION_H__
 
 #include <string>
+#include "dll.h"
 #include "cryptlib.h"
 
 class JException : public CryptoPP::Exception

data/ext/jsha3.h

@@ -30,13 +30,9 @@
 #include "jhmac_t.h"
 #endif
 
-
 // Crypto++ headers...
-
-#ifdef HAVE_CRYPTOPP_SHA3_BLOCKSIZE
+#if ANY_SHA3_HASH_ENABLED || ANY_SHA3_HMAC_ENABLED
 #include "sha3.h"
-#else
-#include "jsha3_blocksizes.h"
 #endif
 
 using namespace CryptoPP;

data/test/ciphers_test.rb

@@ -2,7 +2,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class CiphersTest < MiniTest::Unit::TestCase
+class CiphersTest < Minitest::Test
   extend TestHelper
 
   Dir.glob('test/data/ciphers/*.yml').sort.each do |f|

data/test/digests_test.rb

@@ -2,7 +2,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class DigestsTest < MiniTest::Unit::TestCase
+class DigestsTest < Minitest::Test
   extend TestHelper
 
   Dir.glob('test/data/digests/*.yml').sort.each do |f|

data/test/hmacs_test.rb

@@ -2,7 +2,7 @@
 $: << File.dirname(__FILE__)
 require 'test_helper'
 
-class HMACsTest < MiniTest::Unit::TestCase
+class HMACsTest < Minitest::Test
   extend TestHelper
 
   Dir.glob('test/data/hmacs/*.yml').sort.each do |f|

data/test/test_helper.rb

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'minitest/autorun'
 require 'minitest/reporters' if RUBY_VERSION >= '1.9'
 require 'yaml'
-require File.join(File.dirname(__FILE__), %w{ .. ext cryptopp })
+require 'cryptopp'
 
 puts "Version #{CryptoPP::VERSION}"
 puts "Crypto++ version #{CryptoPP::CRYPTOPP_VERSION}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cryptopp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - J Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies: []
 description: cryptopp is a cryptographic library for Ruby built on Wei Dai's Crypto++.
 email: dark.panda@gmail.com
@@ -19,6 +19,7 @@ extra_rdoc_files:
 - README
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - MIT-LICENSE
@@ -115,7 +116,6 @@ files:
 - ext/jserpent.h
 - ext/jsha.h
 - ext/jsha3.h
-- ext/jsha3_blocksizes.h
 - ext/jshacal2.cpp
 - ext/jshacal2.h
 - ext/jshark.cpp
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: cryptopp is a cryptographic library for Ruby built on Wei Dai's Crypto++.

data/ext/jsha3_blocksizes.h

@@ -1,73 +0,0 @@
-// sha3.h - written and placed in the public domain by Wei Dai
-//
-// This is a patched version of sha3.h that includes definitions for the
-// BLOCKSIZE constants that appear to be missing from the header file.
-// See http://sourceforge.net/apps/trac/cryptopp/ticket/31 for details.
-
-#ifndef CRYPTOPP_JSHA3_BLOCKSIZES_H
-#define CRYPTOPP_JSHA3_BLOCKSIZES_H
-
-#include "cryptlib.h"
-#include "secblock.h"
-
-NAMESPACE_BEGIN(CryptoPP)
-
-/// <a href="http://en.wikipedia.org/wiki/SHA-3">SHA-3</a>
-class SHA3 : public HashTransformation
-{
-public:
-  SHA3(unsigned int digestSize) : m_digestSize(digestSize) {Restart();}
-  unsigned int DigestSize() const {return m_digestSize;}
-  std::string AlgorithmName() const {return "SHA-3-" + IntToString(m_digestSize*8);}
-  unsigned int OptimalDataAlignment() const {return GetAlignmentOf<word64>();}
-
-  void Update(const byte *input, size_t length);
-  void Restart();
-  void TruncatedFinal(byte *hash, size_t size);
-
-protected:
-  inline unsigned int r() const {return 200 - 2 * m_digestSize;}
-
-  FixedSizeSecBlock<word64, 25> m_state;
-  unsigned int m_digestSize, m_counter;
-};
-
-class SHA3_224 : public SHA3
-{
-public:
-  CRYPTOPP_CONSTANT(DIGESTSIZE = 28)
-  CRYPTOPP_CONSTANT(BLOCKSIZE = 144)
-  SHA3_224() : SHA3(DIGESTSIZE) {}
-  static const char * StaticAlgorithmName() {return "SHA-3-224";}
-};
-
-class SHA3_256 : public SHA3
-{
-public:
-  CRYPTOPP_CONSTANT(DIGESTSIZE = 32)
-  CRYPTOPP_CONSTANT(BLOCKSIZE = 136)
-  SHA3_256() : SHA3(DIGESTSIZE) {}
-  static const char * StaticAlgorithmName() {return "SHA-3-256";}
-};
-
-class SHA3_384 : public SHA3
-{
-public:
-  CRYPTOPP_CONSTANT(DIGESTSIZE = 48)
-  CRYPTOPP_CONSTANT(BLOCKSIZE = 104)
-  SHA3_384() : SHA3(DIGESTSIZE) {}
-  static const char * StaticAlgorithmName() {return "SHA-3-384";}
-};
-
-class SHA3_512 : public SHA3
-{
-public:
-  CRYPTOPP_CONSTANT(DIGESTSIZE = 64)
-  CRYPTOPP_CONSTANT(BLOCKSIZE = 72)
-  SHA3_512() : SHA3(DIGESTSIZE) {}
-  static const char * StaticAlgorithmName() {return "SHA-3-512";}
-};
-
-NAMESPACE_END
-
-#endif