Skip to content

Commit

Permalink
Revert "Stop deferring ENGINE_set_pkey_meths()"
Browse files Browse the repository at this point in the history
This reverts commit 3b46228.
  • Loading branch information
mtrojnar committed Aug 6, 2022
1 parent 3b46228 commit 5ab3c0d
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/eng_front.c
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,7 @@ static int bind_helper(ENGINE *e)
!ENGINE_set_cmd_defns(e, engine_cmd_defns) ||
!ENGINE_set_name(e, PKCS11_ENGINE_NAME) ||
!ENGINE_set_load_pubkey_function(e, load_pubkey) ||
!ENGINE_set_load_privkey_function(e, load_privkey) ||
!ENGINE_set_pkey_meths(e, PKCS11_pkey_meths)) {
!ENGINE_set_load_privkey_function(e, load_privkey)) {
return 0;
} else {
ERR_load_ENG_strings();
Expand Down Expand Up @@ -258,7 +257,7 @@ static int bind_helper_methods(ENGINE *e)
!ENGINE_set_ECDH(e, PKCS11_get_ecdh_method()) ||
#endif
#endif /* OPENSSL_VERSION_NUMBER */
0) {
!ENGINE_set_pkey_meths(e, PKCS11_pkey_meths)) {
return 0;
} else {
return 1;
Expand Down

0 comments on commit 5ab3c0d

Please sign in to comment.