Indents

10 files changed, 29 insertions, 24 deletions

diff --git a/ChangeLog b/ChangeLog
index d78235f..1602382 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Tue, 22 Jul 2003 08:33:41 +0200 -- Michal Rokos <m.rokos@sh.cvut.cz>
+	* Indenting
+
 Tue, 22 Jul 2003 06:08:05 +0900 -- GOTOU Yuuzou <gotoyuzo@notwork.org>
 	* lib/**/*.rb: adjust indent.
 	* lib/openssl/ssl.rb: new methods addr, peeraddr, closed?.
diff --git a/lib/openssl/digest.rb b/lib/openssl/digest.rb
index ad5e0b3..58622f5 100644
--- a/lib/openssl/digest.rb
+++ b/lib/openssl/digest.rb
@@ -24,8 +24,8 @@ module OpenSSL
     %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1).each{|digest|
       eval(<<-EOD)
         class #{digest} < Digest
-          def initialize(str=nil)
-            super(\"#{digest}\", str)
+          def initialize(data=nil)
+            super(\"#{digest}\", data)
           end
 
           def #{digest}::digest(data)
diff --git a/openssl_missing.c b/openssl_missing.c
index 6497362..e201e75 100644
--- a/openssl_missing.c
+++ b/openssl_missing.c
@@ -276,3 +276,4 @@ PEM_def_callback(char *buf, int num, int w, void *key)
     return(j);
 }
 #endif
+
diff --git a/ossl.c b/ossl.c
index cddf717..ab4572d 100644
--- a/ossl.c
+++ b/ossl.c
@@ -241,7 +241,7 @@ ossl_x509_ary2sk(VALUE ary)
     sk = sk_X509_new_null();
     if (!sk) ossl_raise(eOSSLError, NULL); 
 
-    for (i = 0; i < RARRAY(ary)->len; i++){
+    for (i = 0; i < RARRAY(ary)->len; i++) {
         val = rb_ary_entry(ary, i);
         if (!rb_obj_is_kind_of(val, cX509Cert)) {
             sk_X509_pop_free(sk, X509_free);
@@ -320,13 +320,13 @@ ossl_pem_passwd_cb(char *buf, int max_len, int flag, void *pwd)
 	 */
 	rflag = flag ? Qtrue : Qfalse;
 	pass  = rb_protect(ossl_pem_passwd_cb0, rflag, &status);
-	if(status) return -1; /* exception was raised. */
+	if (status) return -1; /* exception was raised. */
 	len = RSTRING(pass)->len;
-	if (len < 4){ /* 4 is OpenSSL hardcoded limit */
+	if (len < 4) { /* 4 is OpenSSL hardcoded limit */
 	    rb_warning("password must be longer than 4 bytes");
 	    continue;
 	}
-	if (len > max_len){
+	if (len > max_len) {
 	    rb_warning("password must be shorter then %d bytes", max_len-1);
 	    continue;
 	}
@@ -364,14 +364,14 @@ ossl_verify_cb(int ok, X509_STORE_CTX *ctx)
 	rctx = rb_protect((VALUE(*)(VALUE))ossl_x509stctx_new,
 			  (VALUE)ctx, &state);
 	ret = Qfalse;
-	if(!state){
+	if (!state) {
 	    args.proc = proc;
 	    args.preverify_ok = ok ? Qtrue : Qfalse;
 	    args.store_ctx = rctx;
 	    ret = rb_ensure(ossl_call_verify_cb_proc, (VALUE)&args,
 			    ossl_x509stctx_clear_ptr, rctx);
 	}
-	if(ret == Qtrue){
+	if (ret == Qtrue) {
 	    X509_STORE_CTX_set_error(ctx, X509_V_OK);
 	    ok = 1;
 	}
@@ -515,8 +515,8 @@ Init_openssl()
      * Constants
      */
     rb_define_const(mOSSL, "VERSION", rb_str_new2(OSSL_VERSION));
-    rb_define_const(mOSSL, "OPENSSL_VERSION",rb_str_new2(OPENSSL_VERSION_TEXT));
-    rb_define_const(mOSSL, "OPENSSL_VERSION_NUMBER",INT2NUM(OPENSSL_VERSION_NUMBER));
+    rb_define_const(mOSSL, "OPENSSL_VERSION", rb_str_new2(OPENSSL_VERSION_TEXT));
+    rb_define_const(mOSSL, "OPENSSL_VERSION_NUMBER", INT2NUM(OPENSSL_VERSION_NUMBER));
 
     /*
      * Generic error,
diff --git a/ossl.h b/ossl.h
index 20578f5..e1cd09c 100644
--- a/ossl.h
+++ b/ossl.h
@@ -34,8 +34,8 @@ extern "C" {
 #include <openssl/ssl.h>
 #include <openssl/hmac.h>
 #include <openssl/rand.h>
-#if HAVE_OPENSSL_OCSP_H
-#  define USE_OCSP
+#if defined(HAVE_OPENSSL_OCSP_H)
+#  define OSSL_OCSP_ENABLED
 #  include <openssl/ocsp.h>
 #endif
 #if defined(NT) || defined(_WIN32)
diff --git a/ossl_cipher.c b/ossl_cipher.c
index a00e823..3d63a2a 100644
--- a/ossl_cipher.c
+++ b/ossl_cipher.c
@@ -226,7 +226,7 @@ ossl_cipher_update(VALUE self, VALUE data)
     in = RSTRING(data)->ptr;
     in_len = RSTRING(data)->len;
 	
-    if (!(out = OPENSSL_malloc(in_len+EVP_CIPHER_CTX_block_size(ctx)))){
+    if (!(out = OPENSSL_malloc(in_len+EVP_CIPHER_CTX_block_size(ctx)))) {
 	ossl_raise(eCipherError, NULL);
     }
     if (!EVP_CipherUpdate(ctx, out, &out_len, in, in_len)) {
diff --git a/ossl_ocsp.c b/ossl_ocsp.c
index ca6f03a..3ec5c39 100644
--- a/ossl_ocsp.c
+++ b/ossl_ocsp.c
@@ -11,7 +11,7 @@
  */
 #include "ossl.h"
 
-#ifdef USE_OCSP
+#if defined(OSSL_OCSP_ENABLED)
 
 #define WrapOCSPReq(klass, obj, req) do { \
     if(!req) ossl_raise(rb_eRuntimeError, "Request wasn't initialized!"); \
@@ -757,7 +757,7 @@ Init_ossl_ocsp()
     DefOCSPVConst(RESPID_KEY);
 }
 
-#else /* OPENSSL_VERSION_NUMBER < 0x0090700L */
+#else /* ! OSSL_OCSP_ENABLED */
 void
 Init_ossl_ocsp()
 {
diff --git a/ossl_ocsp.h b/ossl_ocsp.h
index d1d6d7a..65b4f2e 100644
--- a/ossl_ocsp.h
+++ b/ossl_ocsp.h
@@ -12,7 +12,7 @@
 #if !defined(_OSSL_OCSP_H_)
 #define _OSSL_OCSP_H_
 
-#ifdef USE_OCSP
+#if defined(OSSL_OCSP_ENABLED)
 extern VALUE mOCSP;
 extern VALUE cOPCSReq;
 extern VALUE cOPCSRes;
diff --git a/ossl_ssl.c b/ossl_ssl.c
index 2170c7a..e4fb0bf 100644
--- a/ossl_ssl.c
+++ b/ossl_ssl.c
@@ -656,15 +656,15 @@ Init_ossl_ssl()
      * ossl_ssl_def_const(OP_DONT_INSERT_EMPTY_FRAGMENTS);
      */
     ossl_ssl_def_const(OP_ALL);
-#if SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION
+#if defined(SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION)
     ossl_ssl_def_const(OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
 #endif
-#ifdef SSL_OP_SINGLE_ECDH_USE
+#if defined(SSL_OP_SINGLE_ECDH_USE)
     ossl_ssl_def_const(OP_SINGLE_ECDH_USE);
 #endif
     ossl_ssl_def_const(OP_SINGLE_DH_USE);
     ossl_ssl_def_const(OP_EPHEMERAL_RSA);
-#if SSL_OP_CIPHER_SERVER_PREFERENCE
+#if defined(SSL_OP_CIPHER_SERVER_PREFERENCE)
     ossl_ssl_def_const(OP_CIPHER_SERVER_PREFERENCE);
 #endif
     ossl_ssl_def_const(OP_TLS_ROLLBACK_BUG);
diff --git a/ossl_x509.c b/ossl_x509.c
index 4813ebd..1fe50ab 100644
--- a/ossl_x509.c
+++ b/ossl_x509.c
@@ -62,10 +62,10 @@ Init_ossl_x509()
     DefX509Const(V_ERR_KEYUSAGE_NO_CERTSIGN);
     DefX509Const(V_ERR_APPLICATION_VERIFICATION);
 
-#ifdef X509_V_FLAG_CRL_CHECK
+#if defined(X509_V_FLAG_CRL_CHECK)
     DefX509Const(V_FLAG_CRL_CHECK);
 #endif
-#ifdef X509_V_FLAG_CRL_CHECK_ALL
+#if defined(X509_V_FLAG_CRL_CHECK_ALL)
     DefX509Const(V_FLAG_CRL_CHECK_ALL);
 #endif
 
@@ -76,7 +76,7 @@ Init_ossl_x509()
     DefX509Const(PURPOSE_SMIME_ENCRYPT);
     DefX509Const(PURPOSE_CRL_SIGN);
     DefX509Const(PURPOSE_ANY);
-#ifdef X509_PURPOSE_OCSP_HELPER
+#if defined(X509_PURPOSE_OCSP_HELPER)
     DefX509Const(PURPOSE_OCSP_HELPER);
 #endif
 
@@ -85,10 +85,11 @@ Init_ossl_x509()
     DefX509Const(TRUST_SSL_SERVER);
     DefX509Const(TRUST_EMAIL);
     DefX509Const(TRUST_OBJECT_SIGN);
-#ifdef X509_TRUST_OCSP_SIGN
+#if defined(X509_TRUST_OCSP_SIGN)
     DefX509Const(TRUST_OCSP_SIGN);
 #endif
-#ifdef X509_TRUST_OCSP_REQUEST
+#if defined(X509_TRUST_OCSP_REQUEST)
     DefX509Const(TRUST_OCSP_REQUEST);
 #endif
 }
+