HMAC and SPKI cleanups & ports

Author: Michal Rokos

ChangeLog

@@ -3,6 +3,17 @@ ChangeLog for
 
 			### CHANGE LOG ###
 
+Wed,  5 Jun 2002 10:46:17 +0200 -- Michal Rokos <[email protected]>
+	* ns_spki.h: NEW (bits from ossl.h)
+	* ns_spki.c: cleanup & port to Ruby 1.8 interface
+
+Wed,  5 Jun 2002 10:14:54 +0200 -- Michal Rokos <[email protected]>
+	* hmac.h: NEW (bits from ossl.h)
+	* ossl.c: helper function 'string2hex'
+	* hmac.c: use 'string2hex'
+	* digest.c: ditto.
+	* hmac:c: cleanup
+
 Tue,  4 Jun 2002 23:26:07 +0200 -- Michal Rokos <[email protected]>
 	* bn.c: cleanup (remove oddly initialized vars)
 	* config.c: ditto.

ossl.c

@@ -89,6 +89,39 @@ time_to_time_t(VALUE time)
 	return t.tv_sec;
 }
 
+/*
+ * String to HEXString conversion
+ */
+int
+string2hex(char *buf, int buf_len, char **hexbuf, int *hexbuf_len)
+{
+	static const char hex[]="0123456789abcdef";
+	int i, len = 2 * buf_len;
+
+	if (buf_len < 0 || len < buf_len) { /* PARANOIA? */
+		return -1;
+	}
+	if (!hexbuf) {
+		if (hexbuf_len) {
+			*hexbuf_len = len;
+		}
+		return len;
+	}
+	if (!(*hexbuf = OPENSSL_malloc(len + 1))) {
+		return -1;
+	}
+	for (i = 0; i < buf_len; i++) {
+		(*hexbuf)[2 * i] = hex[((unsigned char)buf[i]) >> 4];
+		(*hexbuf)[2 * i + 1] = hex[buf[i] & 0x0f];
+	}
+	(*hexbuf)[2 * i] = '\0';
+	
+	if (hexbuf_len) {
+		*hexbuf_len = len;
+	}
+	return len;
+}
+
 /*
  * Modules
  */
@@ -125,7 +158,6 @@ Init_openssl()
 	 * Universe of Modules
 	 */
 	mOSSL = rb_define_module("OpenSSL");
-	mNetscape = rb_define_module_under(mOSSL, "Netscape");
 	mPKCS7 = rb_define_module_under(mOSSL, "PKCS7");
 	mPKey = rb_define_module_under(mOSSL, "PKey");
 	mRandom = rb_define_module_under(mOSSL, "Random");
@@ -150,11 +182,11 @@ Init_openssl()
 	Init_ossl_cipher();
 	Init_ossl_config();
 	Init_ossl_digest();
-	Init_ossl_hmac(mOSSL);
+	Init_ossl_hmac();
+	Init_ossl_ns_spki();
 	Init_ossl_pkcs7(mPKCS7);
 	Init_ossl_pkey(mPKey);
 	Init_ossl_rand(mRandom);
-	Init_ossl_spki(mNetscape);
 	Init_ossl_ssl(mSSL);
 	Init_ossl_x509();
 }

ossl.h

@@ -55,7 +55,6 @@ extern "C" {
  * Common Module
  */
 extern VALUE mOSSL;
-extern VALUE   mNetscape;
 extern VALUE   mPKCS7;
 extern VALUE   mPKey;
 extern VALUE   mRandom;
@@ -69,8 +68,6 @@ VALUE eOSSLError;
 /*
  * Classes
  */
-extern VALUE cSPKI;
-extern VALUE eSPKIError;
 extern VALUE eRandomError;
 extern VALUE cSSLSocket;
 extern VALUE eSSLError;
@@ -88,9 +85,6 @@ extern VALUE eDHError;
 extern VALUE cPKCS7;
 extern VALUE cPKCS7SignerInfo;
 extern VALUE ePKCS7Error;
-/* HMAC */
-extern VALUE cHMAC;
-extern VALUE eHMACError;
 
 /*
  * CheckTypes
@@ -107,6 +101,11 @@ void ossl_check_instance(VALUE, VALUE);
 VALUE asn1time_to_time(ASN1_UTCTIME *);
 time_t time_to_time_t(VALUE);
 
+/*
+ * String to HEXString conversion
+ */
+int string2hex(char *, int, char **, int *);
+
 /*
  * ERRor messages
  */
@@ -195,20 +194,19 @@ void Init_ossl_pkcs7(VALUE);
 /*
  * HMAC
  */
-void Init_ossl_hmac(VALUE);
 
 #include "openssl_missing.h"
 #include "ossl_bn.h"
 #include "ossl_cipher.h"
 #include "ossl_config.h"
 #include "ossl_digest.h"
+#include "ossl_hmac.h"
+#include "ossl_ns_spki.h"
 /*
  * TODO
-#include "ossl_hmac.h"
 #include "ossl_pkcs7.h"
 #include "ossl_pkey.h"
 #include "ossl_rand.h"
-#include "ossl_spki.h"
 #include "ossl_ssl.h"
  */
 #include "ossl_version.h"

ossl_bn.c

@@ -24,7 +24,7 @@
 	} \
 } while (0)
 #define SafeGetBN(obj, bn) do { \
-	OSSL_Check_Instance(obj, cBN); \
+	OSSL_Check_Kind(obj, cBN); \
 	GetBN(obj, bn); \
 } while (0)
 

ossl_cipher.c

@@ -13,7 +13,7 @@
 #define MakeCipher(obj, klass, ciphp) obj = Data_Make_Struct(klass, ossl_cipher, 0, ossl_cipher_free, ciphp)
 #define GetCipher(obj, ciphp) Data_Get_Struct(obj, ossl_cipher, ciphp)
 #define SafeGetCipher(obj, ciphp) do { \
-	OSSL_Check_Instance(obj, cCipher); \
+	OSSL_Check_Kind(obj, cCipher); \
 	GetCipher(obj, ciphp); \
 } while (0)
 

ossl_digest.c

@@ -23,7 +23,7 @@
 	} \
 } while (0)
 #define SafeGetDigest(obj, ctx) do { \
-	OSSL_Check_Instance(obj, cDigest); \
+	OSSL_Check_Kind(obj, cDigest); \
 	GetDigest(obj, ctx); \
 } while (0)
 
@@ -96,61 +96,57 @@ ossl_digest_update(VALUE self, VALUE data)
 	return self;
 }
 
-static VALUE
-ossl_digest_digest(VALUE self)
+static void
+digest_final(EVP_MD_CTX *ctx, char **buf, int *buf_len)
 {
-	EVP_MD_CTX *ctx, final;
-	char *digest_txt;
-	int digest_len;
-	VALUE digest;
-	
-	GetDigest(self, ctx);
-	
+	EVP_MD_CTX final;
+
 	if (!EVP_MD_CTX_copy(&final, ctx)) {
 		OSSL_Raise(eDigestError, "");
 	}
-	if (!(digest_txt = OPENSSL_malloc(EVP_MD_CTX_size(&final)))) {
+	if (!(*buf = OPENSSL_malloc(EVP_MD_CTX_size(&final)))) {
 		OSSL_Raise(eDigestError, "Cannot allocate mem for digest");
 	}
-	EVP_DigestFinal(&final, digest_txt, &digest_len);
+	EVP_DigestFinal(&final, *buf, buf_len);
+}
 
-	digest = rb_str_new(digest_txt, digest_len);
-	OPENSSL_free(digest_txt);
+static VALUE
+ossl_digest_digest(VALUE self)
+{
+	EVP_MD_CTX *ctx;
+	char *buf;
+	int buf_len;
+	VALUE digest;
+	
+	GetDigest(self, ctx);
+	
+	digest_final(ctx, &buf, &buf_len);
+	
+	digest = rb_str_new(buf, buf_len);
+	OPENSSL_free(buf);
 
 	return digest;
 }
 
 static VALUE
 ossl_digest_hexdigest(VALUE self)
 {
-	EVP_MD_CTX *ctx, final;
-	static const char hex[]="0123456789abcdef";
-	char *digest_txt = NULL, *hexdigest_txt = NULL;
-	int i, digest_len;
+	EVP_MD_CTX *ctx;
+	char *buf, *hexbuf;
+	int buf_len;
 	VALUE hexdigest;
 
 	GetDigest(self, ctx);
 
-	if (!EVP_MD_CTX_copy(&final, ctx)) {
-		OSSL_Raise(eDigestError, "");
-	}
-	if (!(digest_txt = OPENSSL_malloc(EVP_MD_CTX_size(&final)))) {
-		OSSL_Raise(eDigestError, "Cannot allocate memory for digest");
-	}
-	EVP_DigestFinal(&final, digest_txt, &digest_len);
-
-	if (!(hexdigest_txt = OPENSSL_malloc(2 * digest_len + 1))) {
-		OPENSSL_free(digest_txt);
+	digest_final(ctx, &buf, &buf_len);
+	
+	if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
+		OPENSSL_free(buf);
 		OSSL_Raise(eDigestError, "Memory alloc error");
 	}
-	for (i = 0; i < digest_len; i++) {
-		hexdigest_txt[2 * i] = hex[((unsigned char)digest_txt[i]) >> 4];
-		hexdigest_txt[2 * i + 1] = hex[digest_txt[i] & 0x0f];
-	}
-	hexdigest_txt[2 * i] = '\0';
-	hexdigest = rb_str_new(hexdigest_txt, 2 * digest_len);
-	OPENSSL_free(digest_txt);
-	OPENSSL_free(hexdigest_txt);
+	hexdigest = rb_str_new(hexbuf, 2 * buf_len);
+	OPENSSL_free(buf);
+	OPENSSL_free(hexbuf);
 
 	return hexdigest;
 }
@@ -240,7 +236,6 @@ Init_ossl_digest()
 	rb_define_singleton_method(cDigest, "hexdigest", ossl_digest_s_hexdigest, 2);
 
 	rb_define_method(cDigest, "initialize", ossl_digest_initialize, 1);
-	rb_enable_super(cDigest, "initialize");
 
 	rb_define_method(cDigest, "clone",  ossl_digest_clone, 0);