Make it work under Ruby1.7.3 and minor fixes

4 files changed, 14 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index b8e449f..54322e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,9 @@
-$Id$
-'OpenSSL for Ruby' project
-Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
-All rights reserved.
+Mon, 28 Oct 2002 10:39:43 +0100 -- Michal Rokos <m.rokos@sh.cvut.cz>
+	* LICENCE: update to latest Ruby's
+	* extconf.rb: fix to make it work under Ruby 1.7.3
+	* pkey.c: fix MACRO
+	* ChangeLog: changed style
 
-$Log$
 Revision 1.43  2002/07/24 14:46:52  gotoyuzo
 	* lib/openssl/buffering.rb: typo fixed. (Thakns NaHi)
 
diff --git a/LICENCE b/LICENCE
index 776b142..870a5f2 100644
--- a/LICENCE
+++ b/LICENCE
@@ -17,22 +17,22 @@ You can redistribute it and/or modify it under either the terms of the GPL
        b) use the modified software only within your corporation or
           organization.
 
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
 
        d) make other distribution arrangements with the author.
 
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
 
-       a) distribute the executables and library files of the software,
+       a) distribute the binaries and library files of the software,
 	  together with instructions (in the manual page or equivalent)
 	  on where to get the original distribution.
 
        b) accompany the distribution with the machine-readable source of
 	  the software.
 
-       c) give non-standard executables non-standard names, with
+       c) give non-standard binaries non-standard names, with
           instructions on where to get the original software distribution.
 
        d) make other distribution arrangements with the author.
diff --git a/extconf.rb b/extconf.rb
index f1ef1e7..df43ab6 100644
--- a/extconf.rb
+++ b/extconf.rb
@@ -28,7 +28,7 @@ if with_config("debug") or enable_config("debug") # '--enable-debug' or '--with-
 end
 
 if have_header("openssl/ssl.h")
-	if have_library(CRYPTOLIB, nil) and have_library(SSLLIB, nil) #"SSLv23_method")
+	if have_library(CRYPTOLIB, "OpenSSL_add_all_algorithms") and have_library(SSLLIB, "SSLv23_method")
 		create_makefile("openssl")
 	end
 end
diff --git a/ossl_pkey.c b/ossl_pkey.c
index e45b4cf..b93ef53 100644
--- a/ossl_pkey.c
+++ b/ossl_pkey.c
@@ -11,10 +11,10 @@
 #include "ossl.h"
 #include "ossl_pkey.h"
 
-#define GetPKey(obj, pkeyp) {\
+#define GetPKey(obj, pkeyp) do {\
 	Data_Get_Struct(obj, ossl_pkey, pkeyp);\
 	if (!pkeyp->get_EVP_PKEY) rb_raise(ePKeyError, "not initialized!");\
-}
+} while (0)
 
 /*
  * Classes