aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--crypto/Makefile.ssl2
-rw-r--r--test/testreq.pem8
3 files changed, 8 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index a1217540f2..be13cc1af6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
Changes between 0.9.1c and 0.9.2
+ *) ctx_size was not built with the right compiler during "make links". Fixed.
+ [Ben Laurie]
+
*) Change the meaning of 'ALL' in the cipher list. It now means "everything
except NULL ciphers". This means the default cipher list will no longer
enable NULL ciphers. They need to be specifically enabled e.g. with
diff --git a/crypto/Makefile.ssl b/crypto/Makefile.ssl
index 61efbd80ef..66606f5762 100644
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -75,7 +75,7 @@ links:
@$(TOP)/util/point.sh Makefile.ssl Makefile
@for i in $(SDIRS); do \
(cd $$i; echo "making links in crypto/$$i..."; \
- $(MAKE) links ); \
+ $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' links ); \
done;
lib: $(LIBOBJ)
diff --git a/test/testreq.pem b/test/testreq.pem
index b20137b6e3..3acb08599a 100644
--- a/test/testreq.pem
+++ b/test/testreq.pem
@@ -2,8 +2,8 @@
MIIBQjCB7QIBADCBhzELMAkGA1UEBhMCQVUxEzARBgNVBAgTClF1ZWVuc2xhbmQx
ETAPBgNVBAcTCEJyaXNiYW5lMRowGAYDVQQKExFDcnlwdFNvZnQgUHR5IEx0ZDET
MBEGA1UEAxMKRXJpYyBZb3VuZzEfMB0GCSqGSIb3DQEJARYQZWF5QG1pbmNvbS5v
-ei5hdTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDCLwdDF7Fu4DSiae/+3045nf73
-V5OdRnICMXq4M0td4upwgC/ve7w+3q1OzObOpFgpuP1PEOsHGO48GrolDu4lAgMB
-AAGgADANBgkqhkiG9w0BAQQFAANBAItCGg8qCPSoASvm3QUx/6PpreQclDO0bM2l
-eacLlzSHBUvaSqapR/pHfHG2r9l6PuEr/rrYHo+ZrAraSyPhEBc=
+ei5hdTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC4nE2JUY+CCCUVPBHpAwNcRiaA
+Q/obsGLOObP9KTOsLuvf/D0g5AHk6mqwS5PgZZFN4VrP8RAYJImIRIQhlyXLAgMB
+AAGgADANBgkqhkiG9w0BAQQFAANBAG8RVZRDjbQNw6mtQczJqbH89Y5R/YEwVJpV
+f0UKF62bRZihOMTeLcYefhZk99xjtAPAEjRLN48pbd0li622ZNE=
-----END CERTIFICATE REQUEST-----