Skip to content
Snippets Groups Projects

fix compilation without deprecated OpenSSL APIs

Closed Rosen Penev requested to merge neheb/apk-tools:op into master
2 unresolved threads

(De)initialization is deprecated under OpenSSL 1.0 and above.

Signed-off-by: Rosen Penev rosenp@gmail.com

Merge request reports

Checking pipeline status.

Approval is optional

Closed by Timo TeräsTimo Teräs 4 years ago (Jan 27, 2021 7:14am UTC)

Merge details

  • The changes were not merged into master.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
499 499 int
500 500 fetch_ssl(conn_t *conn, const struct url *URL, int verbose)
501 501 {
502 #if OPENSSL_VERSION_NUMBER < 0x10100000L
502 503 /* Init the SSL library and context */
503 504 if (!SSL_library_init()){
  • Since libfetch is bundled statically and not exported. How about just remoing the init calls here, or move them to apk main code if needed for old libssl.

    Edited by Timo Teräs
  • Author Contributor

    I don't use old libssl.

    Actually removing all of these compatibility stuff could be done as OpenSSL 1.0.2 is EOL.

  • Please register or sign in to reply
  • 360 360
    361 361 static void fini_openssl(void)
    362 362 {
    363 #if OPENSSL_VERSION_NUMBER < 0x10100000L
    363 364 EVP_cleanup();
    364 365 #ifndef OPENSSL_NO_ENGINE
    365 366 ENGINE_cleanup();
    366 367 #endif
    367 368 CRYPTO_cleanup_all_ex_data();
    369 #endif
    368 370 }
    369 371
    370 372 static void init_openssl(void)
  • The concept looks good, and thanks for the input! Few comments on moving the relevant things to separate openssl compat header.

  • Rosen Penev added 1 commit

    added 1 commit

    • 824bcf94 - fix compilation without deprecated OpenSSL APIs

    Compare with previous version

  • Merged with some edits in c4c8aa5b, thank you!

  • closed

  • Please register or sign in to reply
    Loading