Some comments.

Submitted by:
Reviewed by:
PR:

diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c
index be8570c30251c8174710476606f8235f2ca7dc7d..70c99ef441964da39d147fe700b9466a3cb6e2b9 100644 (file)
--- a/crypto/asn1/a_gentm.c
+++ b/crypto/asn1/a_gentm.c
@@ -183,8 +183,8 @@ ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
                return(NULL);
 
 #if defined(THREADS) && !defined(WIN32)
-       gmtime_r(&t,&data);
-    ts=&data;
+       gmtime_r(&t,&data); /* should return &data, but doesn't on some systems, so we don't even look at the return value */
+       ts=&data;
 #else
        ts=gmtime(&t);
 #endif

diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
index 848688b7dbd6aa6df969bbd7e12beaf89fa6a5a2..c19b7b2cac58a1272b3a852f374c31a2f5ca533a 100644 (file)
--- a/crypto/asn1/a_time.c
+++ b/crypto/asn1/a_time.c
@@ -98,7 +98,7 @@ ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t)
 
 #if defined(THREADS) && !defined(WIN32)
        gmtime_r(&t,&data);
-    ts=&data;
+       ts=&data; /* should return &data, but doesn't on some systems, so we don't even look at the return value */
 #else
        ts=gmtime(&t);
 #endif

diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index ebc6e384c1c3eeb7849c9e34fcd55692e476351f..557c1efb8e071a14f3cec61dfc825ffcd5281d7e 100644 (file)
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -177,7 +177,7 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t)
                return(NULL);
 
 #if defined(THREADS) && !defined(WIN32)
-       gmtime_r(&t,&data);
+       gmtime_r(&t,&data); /* should return &data, but doesn't on some systems, so we don't even look at the return value */
        ts=&data;
 #else
        ts=gmtime(&t);

diff --git a/tools/c_rehash b/tools/c_rehash
index cc3b65871f06a8987e9509ebe32de9244bd4221a..d89ab38e645d277b52df0c37847ef1ef444abb07 100644 (file)
--- a/tools/c_rehash
+++ b/tools/c_rehash
@@ -8,7 +8,7 @@ if [ "$OPENSSL"x = "x" -o ! -x "$OPENSSL" ]; then
        OPENSSL='openssl'
        export OPENSSL
 fi
-DIR=/usr/local/ssl
+DIR=/usr/ssl
 PATH=$DIR/bin:$PATH
 
 if [ ! -f "$OPENSSL" ]; then

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 7749505c508d28f2bbfb3119f6c385335f93af0a..438097b600420679b8fd3b67f894ac628c863cd0 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -5,7 +5,7 @@
 # funny stuff
 #
 
-$INSTALLTOP="/usr/local/ssl";
+$INSTALLTOP="/usr/ssl";
 
 $ssl_version="0.9.2b";