Skip to content

Commit 30d49bf

Browse files
committed
Fix certificate check callback
Fixes: libgit2#945 libgit2#1262 Signed-off-by: Mathieu Parent <[email protected]>
1 parent 923cfaa commit 30d49bf

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

pygit2/callbacks.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ class RemoteCallbacks(Payload):
113113
RemoteCallbacks(certificate=certificate).
114114
"""
115115

116-
def __init__(self, credentials=None, certificate=None):
116+
def __init__(self, credentials=None, certificate_check=None):
117117
super().__init__()
118118
if credentials is not None:
119119
self.credentials = credentials
120-
if certificate is not None:
121-
self.certificate = certificate
120+
if certificate_check is not None:
121+
self.certificate_check = certificate_check
122122

123123
def sideband_progress(self, string):
124124
"""
@@ -344,7 +344,7 @@ def git_fetch_options(payload, opts=None):
344344
opts.callbacks.transfer_progress = C._transfer_progress_cb
345345
opts.callbacks.update_tips = C._update_tips_cb
346346
opts.callbacks.credentials = C._credentials_cb
347-
opts.callbacks.certificate_check = C._certificate_cb
347+
opts.callbacks.certificate_check = C._certificate_check_cb
348348
# Payload
349349
handle = ffi.new_handle(payload)
350350
opts.callbacks.payload = handle
@@ -368,7 +368,7 @@ def git_push_options(payload, opts=None):
368368
opts.callbacks.transfer_progress = C._transfer_progress_cb
369369
opts.callbacks.update_tips = C._update_tips_cb
370370
opts.callbacks.credentials = C._credentials_cb
371-
opts.callbacks.certificate_check = C._certificate_cb
371+
opts.callbacks.certificate_check = C._certificate_check_cb
372372
opts.callbacks.push_update_reference = C._push_update_reference_cb
373373
# Payload
374374
handle = ffi.new_handle(payload)
@@ -457,7 +457,7 @@ def wrapper(*args):
457457

458458

459459
@libgit2_callback
460-
def _certificate_cb(cert_i, valid, host, data):
460+
def _certificate_check_cb(cert_i, valid, host, data):
461461
# We want to simulate what should happen if libgit2 supported pass-through
462462
# for this callback. For SSH, 'valid' is always False, because it doesn't
463463
# look at known_hosts, but we do want to let it through in order to do what

pygit2/decl/callbacks.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
extern "Python" int _certificate_cb(
1+
extern "Python" int _certificate_check_cb(
22
git_cert *cert,
33
int valid,
44
const char *host,

0 commit comments

Comments
 (0)