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.

28 lines
921 B

  1. --- a/deps/neverbleed/neverbleed.c
  2. +++ b/deps/neverbleed/neverbleed.c
  3. @@ -1486,6 +1486,7 @@ int neverbleed_init(neverbleed_t *nb, char *errbuf)
  4. close(pipe_fds[0]);
  5. pipe_fds[0] = -1;
  6. +#ifndef OPENSSL_NO_ENGINE
  7. /* setup engine */
  8. if ((nb->engine = ENGINE_new()) == NULL || !ENGINE_set_id(nb->engine, "neverbleed") ||
  9. !ENGINE_set_name(nb->engine, "privilege separation software engine") || !ENGINE_set_RSA(nb->engine, rsa_method)
  10. @@ -1497,6 +1498,7 @@ int neverbleed_init(neverbleed_t *nb, char *errbuf)
  11. goto Fail;
  12. }
  13. ENGINE_add(nb->engine);
  14. +#endif
  15. /* setup thread key */
  16. pthread_key_create(&nb->thread_key, dispose_thread_data);
  17. @@ -1515,7 +1517,9 @@ Fail:
  18. if (listen_fd != -1)
  19. close(listen_fd);
  20. if (nb->engine != NULL) {
  21. +#ifndef OPENSSL_NO_ENGINE
  22. ENGINE_free(nb->engine);
  23. +#endif
  24. nb->engine = NULL;
  25. }
  26. return -1;