cyberplat_pki 2.0.0 → 2.0.1

data/cyberplat_pki.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "cyberplat_pki"
-  gem.version       = "2.0.0"
+  gem.version       = "2.0.1"
   gem.authors       = ["Peter Zotov"]
   gem.email         = ["whitequark@whitequark.org"]
   gem.description   = %q{CyberplatPKI is a library for signing Cyberplat requests.}
@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+  gem.extensions    = ["ext/mock_the_clock/extconf.rb"]
 
   gem.add_development_dependency "rspec"
   gem.add_dependency 'digest-crc' # For CRC24

data/ext/mock_the_clock/.gitignore

@@ -0,0 +1 @@
+*.so

data/ext/mock_the_clock/Makefile

@@ -0,0 +1,2 @@
+mock_the_clock.so: mock_the_clock.c
+	gcc -m32 -shared -fPIC -nostdlib -o $@ $<

data/ext/mock_the_clock/extconf.rb

@@ -0,0 +1 @@
+system "make"

data/ext/mock_the_clock/mock_the_clock.c

@@ -0,0 +1,53 @@
+#include <string.h>
+#include <assert.h>
+#include <sys/time.h>
+#include <time.h>
+#include <dlfcn.h>
+
+/* Remember, remember the fifth of November! 2005-11-05 00:00 UTC. */
+#define TIMESTAMP 1131148800
+
+int gettimeofday(struct timeval *tv, struct timezone *tz)
+{
+  if(tv) {
+    tv->tv_sec  = TIMESTAMP;
+    tv->tv_usec = 0;
+  }
+
+  if(tz) {
+    tz->tz_minuteswest = 0;
+    tz->tz_dsttime     = 0;
+  }
+
+  return 0;
+}
+
+time_t time(time_t *t)
+{
+  if(t) {
+    *t = TIMESTAMP;
+  }
+
+  return TIMESTAMP;
+}
+
+int clock_gettime(clockid_t clk_id, struct timespec *tp) {
+  static int (*original)(clockid_t clk_id, struct timespec *tp);
+
+  if(original == NULL) {
+    void *hndl = dlopen("librt.so.1", RTLD_LAZY);
+    assert(hndl);
+    original = dlsym(hndl, "clock_gettime");
+  }
+
+  switch(clk_id) {
+    case CLOCK_REALTIME:
+      tp->tv_sec  = TIMESTAMP;
+      tp->tv_nsec = 0;
+
+      return 0;
+
+    default:
+      return original(clk_id, tp);
+  }
+}

data/lib/cyberplat_pki/key.rb

@@ -89,7 +89,10 @@ module CyberplatPKI
       digest.update signature.metadata
       signature.hash_msw = digest.digest[0..1]
 
-      signature_block = Document.encode64 Packet.save([ signature ])
+      trust = TrustPacket.new
+      trust.trust = 0xC7.chr
+
+      signature_block = Packet.save([ signature, trust ])
 
       doc = Document.new
       doc.engine      = 1
@@ -98,7 +101,7 @@ module CyberplatPKI
       doc.ca          = KeyId.new '', 0
       doc.data_length = data.length
       doc.body        = data
-      doc.signature   = signature_block
+      doc.signature   = Document.encode64 signature_block
 
       text = Document.save [ doc ]
 

data/lib/cyberplat_pki/packet_io_routines.rb

@@ -45,17 +45,15 @@ module CyberplatPKI
 
       packet_type = (PACKET_TYPES.key(packet.class) << 2) | 0x80
 
-      case data.length
-      when 0x00..0xFF
+      if data.length <= 0xFF && !packet.kind_of?(SignaturePacket) && !packet.kind_of?(KeyPacket)
         putc packet_type
         putc data.length
-
-      when 0x0100..0xFFFF
+      elsif data.length <= 0xFFFF
         putc packet_type | 1
 
         write [ data.length ].pack("n")
 
-      when 0x00010000..0xFFFFFFFF
+      else
         putc packet_type | 2
 
         write [ data.length ].pack("N")

data/spec/spec_helper.rb

@@ -16,4 +16,15 @@ RSpec.configure do |config|
   config.order = 'random'
 end
 
+require 'time'
+
+if Time.now != Time.parse('5th November 2005 00:00 UTC')
+  puts "Travelling back in time..."
+
+  mock_path = File.expand_path('../../ext/mock_the_clock/mock_the_clock.so', __FILE__)
+  exec "sh", "-c", "LD_PRELOAD=#{mock_path} #{$0}"
+else
+  puts "Time.now: #{Time.now}"
+end
+
 require 'cyberplat_pki'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyberplat_pki
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-11 00:00:00.000000000 Z
+date: 2012-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -63,7 +63,8 @@ description: CyberplatPKI is a library for signing Cyberplat requests.
 email:
 - whitequark@whitequark.org
 executables: []
-extensions: []
+extensions:
+- ext/mock_the_clock/extconf.rb
 extra_rdoc_files: []
 files:
 - .gitignore
@@ -74,6 +75,10 @@ files:
 - README.md
 - Rakefile
 - cyberplat_pki.gemspec
+- ext/mock_the_clock/.gitignore
+- ext/mock_the_clock/Makefile
+- ext/mock_the_clock/extconf.rb
+- ext/mock_the_clock/mock_the_clock.c
 - lib/cyberplat_pki.rb
 - lib/cyberplat_pki/document.rb
 - lib/cyberplat_pki/document_io_routines.rb