camellia-rb 1.1 → 1.2

data/History.txt

@@ -16,3 +16,16 @@ Changes from version 1.0
 * the directory name of extended library is changed to 'ext'
 
 * unused file/directory is deleted from the package
+
+== 1.2 2009-01-20
+Changes from version 1.1
+
+* It corresponded to ruby-1.9.1-rc1. 
+
+* 'RSTRING()->len' is changed to 'RSTRING_LEN()'.
+
+* 'RSTRING()->ptr' is changed to 'RSTRING_PTR()'.
+
+* This version is tested in ruby 1.8.5, 1.8.7 and 1.9.1 rc1 environment.
+
+* In the version before ruby 1.8.5 that can not use RSTRING_LEN/RSTRING_PTR, then they are automatically defined using RSTRING internally.

data/License.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2008
+Copyright (c) 2008-2009
 NTT (Nippon Telegraph and Telephone Corporation) . All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.txt

@@ -76,7 +76,7 @@ Sample program(camellia-example.rb)
 
 ############################################################
 
- * Copyright (c) 2008
+ * Copyright (c) 2008-2009
  * NTT (Nippon Telegraph and Telephone Corporation) . All rights reserved.
 
-############################################################
+############################################################

data/ext/camellia-example.rb

@@ -1,6 +1,6 @@
 #* camellia-example.rb
 #*
-#* Copyright (c) 2008
+#* Copyright (c) 2008-2009
 #* NTT (Nippon Telegraph and Telephone Corporation) . All rights reserved.
 #*
 #* Redistribution and use in source and binary forms, with or without

data/ext/camellia-rb.c

@@ -1,6 +1,6 @@
 /* camellia-rb.c
  *
- * Copyright (c) 2008
+ * Copyright (c) 2008-2009
  * NTT (Nippon Telegraph and Telephone Corporation) . All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,6 +28,14 @@
 #include "camellia.h"
 #include <stdio.h>
 
+// for version before Ruby 1.8.5
+#ifndef RSTRING_PTR
+#  define RSTRING_PTR(s) (RSTRING(s)->ptr)
+#endif
+#ifndef RSTRING_LEN
+#  define RSTRING_LEN(s) (RSTRING(s)->len)
+#endif
+
 typedef unsigned char u1byte;
 
 // error class
@@ -52,6 +60,7 @@ typedef struct {
 */
 static VALUE s_new(VALUE self)
 {
+
 	camelliaObject *camellia;
 	VALUE camellia_data;
 
@@ -80,8 +89,8 @@ static VALUE set_key(VALUE self, VALUE key)
 	Data_Get_Struct(self, camelliaObject, camellia);
 
 	Check_Type(key, T_STRING);
-	skey_len = RSTRING(key)->len;
-	skey = (unsigned char *)RSTRING(key)->ptr;
+	skey_len = RSTRING_LEN(key);
+	skey = (unsigned char *)RSTRING_PTR(key);
 
 	// check key length
 	if (skey_len != 16 && skey_len != 24 && skey_len != 32)
@@ -110,8 +119,8 @@ static VALUE encrypt(VALUE self, VALUE args)
 	u1byte out_blk[16];
 
 	Check_Type(args, T_STRING);
-	data_len = RSTRING(args)->len;
-	data = (unsigned char *)RSTRING(args)->ptr;
+	data_len = RSTRING_LEN(args);
+	data = (unsigned char *)RSTRING_PTR(args);
 
 	Data_Get_Struct(self, camelliaObject, camellia);
 
@@ -146,8 +155,8 @@ static VALUE decrypt(VALUE self,VALUE args)
 	u1byte out_blk[16];
 
 	Check_Type(args, T_STRING);
-	data_len = RSTRING(args)->len;
-	data = (unsigned char *)RSTRING(args)->ptr;
+	data_len = RSTRING_LEN(args);
+	data = (unsigned char *)RSTRING_PTR(args);
 
 	// check data length
 	if (data_len != 16)
@@ -183,8 +192,8 @@ static VALUE cfb_salt(VALUE self, VALUE args)
 	int i;
 
 	Check_Type(args,T_STRING);
-	src = (unsigned char *)RSTRING(args)->ptr;
-	src_len = RSTRING(args)->len;
+	src = (unsigned char *)RSTRING_PTR(args);
+	src_len = RSTRING_LEN(args);
 
 	// check IV length
 	if (src_len != 16)
@@ -219,8 +228,8 @@ static VALUE cfb_encrypt(VALUE self,VALUE args)
 	VALUE retvalue;
 
 	Check_Type(args,T_STRING);
-	src = (unsigned char *)RSTRING(args)->ptr;
-	srclen = RSTRING(args)->len;
+	src = (unsigned char *)RSTRING_PTR(args);
+	srclen = RSTRING_LEN(args);
 
 	Data_Get_Struct(self,camelliaObject,camellia);
 
@@ -272,8 +281,8 @@ static VALUE cfb_decrypt(VALUE *self, VALUE args)
 	VALUE retvalue;
 
 	Check_Type(args, T_STRING);
-	srclen = RSTRING(args)->len;
-	src = (unsigned char *)RSTRING(args)->ptr;
+	srclen = RSTRING_LEN(args);
+	src = (unsigned char *)RSTRING_PTR(args);
 
 	Data_Get_Struct(self,camelliaObject, camellia);
 
@@ -323,8 +332,8 @@ static VALUE cbc_salt(VALUE self, VALUE args)
 	int i;
 
 	Check_Type(args,T_STRING);
-	src = (unsigned char *)RSTRING(args)->ptr;
-	src_len = RSTRING(args)->len;
+	src = (unsigned char *)RSTRING_PTR(args);
+	src_len = RSTRING_LEN(args);
 
 	// check IV length
 	if (src_len != 16)
@@ -358,8 +367,8 @@ static VALUE cbc_pchar(VALUE self, VALUE args)
 	int src_len;
 
 	Check_Type(args,T_STRING);
-	src = (unsigned char *)RSTRING(args)->ptr;
-	src_len = RSTRING(args)->len;
+	src = (unsigned char *)RSTRING_PTR(args);
+	src_len = RSTRING_LEN(args);
 
 	// check pcharlength
 	if (src_len != 1)
@@ -389,8 +398,8 @@ static VALUE cbc_encrypt(VALUE self,VALUE args)
 	VALUE retvalue;
 
 	Check_Type(args,T_STRING);
-	src = (unsigned char *)RSTRING(args)->ptr;
-	srclen = RSTRING(args)->len;
+	src = (unsigned char *)RSTRING_PTR(args);
+	srclen = RSTRING_LEN(args);
 
 	Data_Get_Struct(self,camelliaObject,camellia);
 
@@ -467,9 +476,9 @@ static VALUE cbc_decrypt(VALUE *self, VALUE args)
 	VALUE retvalue;
 
 	Check_Type(args, T_STRING);
-	srclen = RSTRING(args)->len;
-	src = (unsigned char *)RSTRING(args)->ptr;
-
+	srclen = RSTRING_LEN(args);
+	src = (unsigned char *)RSTRING_PTR(args);
+	
 	Data_Get_Struct(self,camelliaObject, camellia);
 
 	// check if key is initialized

data/ext/extconf.rb

@@ -1,6 +1,6 @@
 #* extconf.rb
 #*
-#* Copyright (c) 2008
+#* Copyright (c) 2008-2009
 #* NTT (Nippon Telegraph and Telephone Corporation) . All rights reserved.
 #*
 #* Redistribution and use in source and binary forms, with or without

data/lib/camellia/version.rb

@@ -1,7 +1,7 @@
 module Camellia #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
 
     STRING = [MAJOR, MINOR].join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: camellia-rb
 version: !ruby/object:Gem::Version 
-  version: "1.1"
+  version: "1.2"
 platform: ruby
 authors: 
 - FIXME full name
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-09 00:00:00 +09:00
+date: 2009-01-26 00:00:00 +09:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.8.0
+    version: 
 description: description of gem
 email: 
 - FIXME email
@@ -79,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: camellia-rb
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: description of gem