You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

38 lines
1.1 KiB

  1. --- a/src/gssl/gssl_openssl.cpp
  2. +++ b/src/gssl/gssl_openssl.cpp
  3. @@ -51,10 +51,12 @@ GSsl::OpenSSL::LibraryImp::LibraryImp( G::StringArray & library_config , Library
  4. m_verbose(verbose) ,
  5. m_config(library_config)
  6. {
  7. +#if OPENSSL_VERSION_NUMBER < 0x10100000L
  8. SSL_load_error_strings() ;
  9. SSL_library_init() ;
  10. - int rc = RAND_status() ; G_IGNORE_VARIABLE(int,rc) ;
  11. OpenSSL_add_all_digests() ;
  12. +#endif
  13. + int rc = RAND_status() ; G_IGNORE_VARIABLE(int,rc) ;
  14. // allocate a slot for a pointer from SSL to ProtocolImp
  15. m_index = SSL_get_ex_new_index( 0 , nullptr , nullptr , nullptr , nullptr ) ;
  16. @@ -72,15 +74,21 @@ GSsl::OpenSSL::LibraryImp::~LibraryImp()
  17. void GSsl::OpenSSL::LibraryImp::cleanup()
  18. {
  19. +#if OPENSSL_VERSION_NUMBER < 0x10100000L
  20. // ffs...
  21. ERR_free_strings() ;
  22. RAND_cleanup() ;
  23. CRYPTO_cleanup_all_ex_data();
  24. +#endif
  25. }
  26. std::string GSsl::OpenSSL::LibraryImp::sid()
  27. {
  28. +#if OPENSSL_VERSION_NUMBER < 0x10100000L
  29. return G::Str::printable( SSLeay_version(SSLEAY_VERSION) ) ;
  30. +#else
  31. + return G::Str::printable( OpenSSL_version(OPENSSL_VERSION) ) ;
  32. +#endif
  33. }
  34. std::string GSsl::OpenSSL::LibraryImp::id() const