merge master

diff --cc Makefile.in
Simple merge

diff --cc configure
Simple merge

diff --cc testcode/petal.c
index 78f1ca2f57309058a407a28c2202a6febb06eef5,a1a37615518ad50e1469ccb89adad82a23d4e2b1..fbe5ac61b21a445bf8cd4d22520287dd0c1d7eef
--- 1/testcode/petal.c
--- 2/testcode/petal.c
+++ b/testcode/petal.c
@@@ -241,11 -238,11 +241,14 @@@ setup_ctx(char* key, char* cert
        (void)SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2);
  #endif
        (void)SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv3);
 -      if(!SSL_CTX_use_certificate_chain_file(ctx, cert))
+ #ifdef HAVE_SSL_CTX_SET_SECURITY_LEVEL
+       SSL_CTX_set_security_level(ctx, 0); /* for keys in tests */
+ #endif
-               int e = ERR_peek_error();
-               printf("error string: %s\n", ERR_reason_error_string(e));
 +      if(!SSL_CTX_use_certificate_chain_file(ctx, cert)) {
++          int e = ERR_peek_error();
++      printf("error string: %s\n", ERR_reason_error_string(e));
                print_exit("cannot read cert");
 +      }
        if(!SSL_CTX_use_PrivateKey_file(ctx, key, SSL_FILETYPE_PEM))
                print_exit("cannot read key");
        if(!SSL_CTX_check_private_key(ctx))

diff --cc util/netevent.c
Simple merge