Need to use larger RSA key for tests.
This commit is contained in:
Tomas Mraz
parent
e436950b07
commit
44dc6d181e
@ -1,6 +1,6 @@
|
||||
diff -up libevent-2.0.22-stable/bufferevent_openssl.c.openssl11 libevent-2.0.22-stable/bufferevent_openssl.c
|
||||
--- libevent-2.0.22-stable/bufferevent_openssl.c.openssl11 2014-02-09 19:34:43.000000000 +0100
|
||||
+++ libevent-2.0.22-stable/bufferevent_openssl.c 2017-03-27 15:52:55.551190297 +0200
|
||||
+++ libevent-2.0.22-stable/bufferevent_openssl.c 2017-03-27 16:00:34.442978756 +0200
|
||||
@@ -60,6 +60,7 @@
|
||||
#include <openssl/bio.h>
|
||||
#include <openssl/ssl.h>
|
||||
@ -147,8 +147,8 @@ diff -up libevent-2.0.22-stable/bufferevent_openssl.c.openssl11 libevent-2.0.22-
|
||||
break;
|
||||
case SSL_ERROR_SSL:
|
||||
diff -up libevent-2.0.22-stable/openssl-compat.h.openssl11 libevent-2.0.22-stable/openssl-compat.h
|
||||
--- libevent-2.0.22-stable/openssl-compat.h.openssl11 2017-03-27 15:48:49.523406230 +0200
|
||||
+++ libevent-2.0.22-stable/openssl-compat.h 2017-03-27 15:53:48.286430092 +0200
|
||||
--- libevent-2.0.22-stable/openssl-compat.h.openssl11 2017-03-27 16:00:34.442978756 +0200
|
||||
+++ libevent-2.0.22-stable/openssl-compat.h 2017-03-27 16:00:34.442978756 +0200
|
||||
@@ -0,0 +1,35 @@
|
||||
+#ifndef OPENSSL_COMPAT_H
|
||||
+#define OPENSSL_COMPAT_H
|
||||
@ -187,7 +187,7 @@ diff -up libevent-2.0.22-stable/openssl-compat.h.openssl11 libevent-2.0.22-stabl
|
||||
+#endif /* OPENSSL_COMPAT_H */
|
||||
diff -up libevent-2.0.22-stable/sample/le-proxy.c.openssl11 libevent-2.0.22-stable/sample/le-proxy.c
|
||||
--- libevent-2.0.22-stable/sample/le-proxy.c.openssl11 2012-02-10 23:17:14.000000000 +0100
|
||||
+++ libevent-2.0.22-stable/sample/le-proxy.c 2017-03-27 15:53:48.286430092 +0200
|
||||
+++ libevent-2.0.22-stable/sample/le-proxy.c 2017-03-27 16:00:34.442978756 +0200
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <openssl/ssl.h>
|
||||
#include <openssl/err.h>
|
||||
@ -218,8 +218,8 @@ diff -up libevent-2.0.22-stable/sample/le-proxy.c.openssl11 libevent-2.0.22-stab
|
||||
listener = evconnlistener_new_bind(base, accept_cb, NULL,
|
||||
diff -up libevent-2.0.22-stable/test/regress_ssl.c.openssl11 libevent-2.0.22-stable/test/regress_ssl.c
|
||||
--- libevent-2.0.22-stable/test/regress_ssl.c.openssl11 2013-02-05 21:00:51.000000000 +0100
|
||||
+++ libevent-2.0.22-stable/test/regress_ssl.c 2017-03-27 15:56:53.120775513 +0200
|
||||
@@ -49,6 +49,7 @@
|
||||
+++ libevent-2.0.22-stable/test/regress_ssl.c 2017-03-27 16:44:26.814402266 +0200
|
||||
@@ -49,22 +49,40 @@
|
||||
#include <openssl/bio.h>
|
||||
#include <openssl/err.h>
|
||||
#include <openssl/pem.h>
|
||||
@ -227,7 +227,51 @@ diff -up libevent-2.0.22-stable/test/regress_ssl.c.openssl11 libevent-2.0.22-sta
|
||||
|
||||
#include <string.h>
|
||||
|
||||
@@ -137,7 +138,7 @@ get_ssl_ctx(void)
|
||||
-/* A short pre-generated key, to save the cost of doing an RSA key generation
|
||||
- * step during the unit tests. It's only 512 bits long, and it is published
|
||||
- * in this file, so you would have to be very foolish to consider using it in
|
||||
- * your own code. */
|
||||
+/* A pre-generated key, to save the cost of doing an RSA key generation step
|
||||
+ * during the unit tests. It is published in this file, so you would have to
|
||||
+ * be very foolish to consider using it in your own code. */
|
||||
static const char KEY[] =
|
||||
"-----BEGIN RSA PRIVATE KEY-----\n"
|
||||
- "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
- "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
- "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
- "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
- "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
- "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
- "U6GFEQTZ3IfuiVabG5pummdC4DNbcdI+WKrSFNmQ\n"
|
||||
+ "MIIEogIBAAKCAQEAtK07Ili0dkJb79m/sFmHoVJTWyLoveXex2yX/BtUzzcvZEOu\n"
|
||||
+ "QLon/++5YOA48kzZm5K9mIwZkZhui1ZgJ5Bjq0LGAWTZGIn+NXjLFshPYvTKpOCW\n"
|
||||
+ "uzL0Ir0LXMsBLYJQ5A4FomLNxs4I3H/dhDSGy/rSiJB1B4w2xNiwPK08/VL3zZqk\n"
|
||||
+ "V+GsSvGIIkzhTMbqPJy9K8pqyjwOU2pgORS794yXciTGxWYjTDzJPgQ35YMDATaG\n"
|
||||
+ "jr4HHo1zxU/Lj0pndSUK5rKLYxYQ3Uc8B3AVYDl9CP/GbOoQ4LBzS68JjcAUyp6i\n"
|
||||
+ "6NfXlc2D9S9XgqVqwI+JqgJs0eW/+zPY2UEDWwIDAQABAoIBAD2HzV66FOM9YDAD\n"
|
||||
+ "2RtGskEHV2nvLpIVadRCsFPkPvK+2X3s6rgSbbLkwh4y3lHuSCGKTNVZyQ9jeSos\n"
|
||||
+ "xVxT+Q2HFQW+gYyw2gj91TQyDY8mzKhv8AVaqff2p5r3a7RC8CdqexK9UVUGL9Bg\n"
|
||||
+ "H2F5vfpTtkVZ5PEoGDLblNFlMiMW/t1SobUeBVx+Msco/xqk9lFv1A9nnepGy0Gi\n"
|
||||
+ "D+i6YNGTBsX22YhoCZl/ICxCL8lgqPei4FvBr9dBVh/jQgjuUBm2jz55p2r7+7Aw\n"
|
||||
+ "khmXHReejoVokQ2+htgSgZNKlKuDy710ZpBqnDi8ynQi82Y2qCpyg/p/xcER54B6\n"
|
||||
+ "hSftaiECgYEA2RkSoxU+nWk+BClQEUZRi88QK5W/M8oo1DvUs36hvPFkw3Jk/gz0\n"
|
||||
+ "fgd5bnA+MXj0Fc0QHvbddPjIkyoI/evq9GPV+JYIuH5zabrlI3Jvya8q9QpAcEDO\n"
|
||||
+ "KkL/O09qXVEW52S6l05nh4PLejyI7aTyTIN5nbVLac/+M8MY/qOjZksCgYEA1Q1o\n"
|
||||
+ "L8kjSavU2xhQmSgZb9W62Do60sa3e73ljrDPoiyvbExldpSdziFYxHBD/Rep0ePf\n"
|
||||
+ "eVSGS3VSwevt9/jSGo2Oa83TYYns9agBm03oR/Go/DukESdI792NsEM+PRFypVNy\n"
|
||||
+ "AohWRLj0UU6DV+zLKp0VBavtx0ATeLFX0eN17TECgYBI2O/3Bz7uhQ0JSm+SjFz6\n"
|
||||
+ "o+2SInp5P2G57aWu4VQWWY3tQ2p+EQzNaWam10UXRrXoxtmc+ktPX9e2AgnoYoyB\n"
|
||||
+ "myqGcpnUhqHlnZAb999o9r1cYidDQ4uqhLauSTSwwXAFDzjJYsa8o03Y440y6QFh\n"
|
||||
+ "CVD6yYXXqLJs3g96CqDexwKBgAHxq1+0QCQt8zVElYewO/svQhMzBNJjic0RQIT6\n"
|
||||
+ "zAo4yij80XgxhvcYiszQEW6/xobpw2JCCS+rFGQ8mOFIXfJsFD6blDAxp/3d2JXo\n"
|
||||
+ "MhRl+hrDGI4ng5zcsqxHEMxR2m/zwPiQ8eiSn3gWdVBaEsiCwmxY00ScKxFQ3PJH\n"
|
||||
+ "Vw4hAoGAdZLd8KfjjG6lg7hfpVqavstqVi9LOgkHeCfdjn7JP+76kYrgLk/XdkrP\n"
|
||||
+ "N/BHhtFVFjOi/mTQfQ5YfZImkm/1ePBy7437DT8BDkOxspa50kK4HPggHnU64h1w\n"
|
||||
+ "lhdEOj7mAgHwGwwVZWOgs9Lq6vfztnSuhqjha1daESY6kDscPIQ=\n"
|
||||
"-----END RSA PRIVATE KEY-----\n";
|
||||
|
||||
static EVP_PKEY *
|
||||
@@ -137,7 +155,7 @@ get_ssl_ctx(void)
|
||||
{
|
||||
if (the_ssl_ctx)
|
||||
return the_ssl_ctx;
|
||||
@ -236,7 +280,7 @@ diff -up libevent-2.0.22-stable/test/regress_ssl.c.openssl11 libevent-2.0.22-sta
|
||||
if (!the_ssl_ctx)
|
||||
return NULL;
|
||||
if (disable_tls_11_and_12) {
|
||||
@@ -154,6 +155,7 @@ get_ssl_ctx(void)
|
||||
@@ -154,6 +172,7 @@ get_ssl_ctx(void)
|
||||
static void
|
||||
init_ssl(void)
|
||||
{
|
||||
@ -244,7 +288,7 @@ diff -up libevent-2.0.22-stable/test/regress_ssl.c.openssl11 libevent-2.0.22-sta
|
||||
SSL_library_init();
|
||||
ERR_load_crypto_strings();
|
||||
SSL_load_error_strings();
|
||||
@@ -161,6 +163,7 @@ init_ssl(void)
|
||||
@@ -161,6 +180,7 @@ init_ssl(void)
|
||||
if (SSLeay() != OPENSSL_VERSION_NUMBER) {
|
||||
TT_DECLARE("WARN", ("Version mismatch for openssl: compiled with %lx but running with %lx", (unsigned long)OPENSSL_VERSION_NUMBER, (unsigned long)SSLeay()));
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user