recent changes from 0.9.8: fix cipher list order in s3_lib.c,
make "no-ssl2" work again
PR: 1217
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 5f74c51..9b7a387 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -2241,6 +2241,7 @@
const SSL_METHOD *meth;
SSL_CIPHER *ci, *tci = NULL;
+#ifndef OPENSSL_NO_SSL2
fprintf(stderr, "testing SSLv2 cipher list order: ");
meth = SSLv2_method();
while ((ci = meth->get_cipher(i++)) != NULL)
@@ -2254,7 +2255,8 @@
tci = ci;
}
fprintf(stderr, "ok\n");
-
+#endif
+#ifndef OPENSSL_NO_SSL3
fprintf(stderr, "testing SSLv3 cipher list order: ");
meth = SSLv3_method();
tci = NULL;
@@ -2269,7 +2271,8 @@
tci = ci;
}
fprintf(stderr, "ok\n");
-
+#endif
+#ifndef OPENSSL_NO_TLS1
fprintf(stderr, "testing TLSv1 cipher list order: ");
meth = TLSv1_method();
tci = NULL;
@@ -2284,6 +2287,7 @@
tci = ci;
}
fprintf(stderr, "ok\n");
+#endif
return 1;
}
