patch-sslcls_c 1.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354
  1. $OpenBSD: patch-sslcls_c,v 1.4 2015/07/20 01:12:09 jca Exp $
  2. --- sslcls.c.orig Sat Jan 24 03:15:22 2015
  3. +++ sslcls.c Sat Jul 18 20:01:59 2015
  4. @@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) {
  5. }
  6. #endif
  7. +#ifdef HAVE_SSLv3_client_method
  8. const SSL_METHOD *sycSSLv3_client_method(void) {
  9. const SSL_METHOD *result;
  10. Debug("SSLv3_client_method()");
  11. @@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) {
  12. Debug1("SSLv3_client_method() -> %p", result);
  13. return result;
  14. }
  15. +#endif
  16. +#ifdef HAVE_SSLv3_server_method
  17. const SSL_METHOD *sycSSLv3_server_method(void) {
  18. const SSL_METHOD *result;
  19. Debug("SSLv3_server_method()");
  20. @@ -70,6 +73,7 @@ const SSL_METHOD *sycSSLv3_server_method(void) {
  21. Debug1("SSLv3_server_method() -> %p", result);
  22. return result;
  23. }
  24. +#endif
  25. const SSL_METHOD *sycSSLv23_client_method(void) {
  26. const SSL_METHOD *result;
  27. @@ -331,14 +335,6 @@ void sycSSL_free(SSL *ssl) {
  28. return;
  29. }
  30. -int sycRAND_egd(const char *path) {
  31. - int result;
  32. - Debug1("RAND_egd(\"%s\")", path);
  33. - result = RAND_egd(path);
  34. - Debug1("RAND_egd() -> %d", result);
  35. - return result;
  36. -}
  37. -
  38. DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) {
  39. DH *result;
  40. Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)",
  41. @@ -375,7 +371,7 @@ int sycFIPS_mode_set(int onoff) {
  42. }
  43. #endif /* WITH_FIPS */
  44. -#if OPENSSL_VERSION_NUMBER >= 0x00908000L
  45. +#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP)
  46. const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl) {
  47. const COMP_METHOD *result;
  48. Debug1("SSL_get_current_compression(%p)", ssl);