summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2014-08-10 17:06:53 +0200
committerCarlos Martín Nieto <cmn@dwim.me>2014-09-16 17:01:30 +0200
commitec1ce4584a6a8ec2b5b227301a918548907a2b02 (patch)
tree25099b0509bcf0f6cebcf8ad874696a4e815a0df /include
parent9b9405865e15da3a0a6ee0a67b59b36c5a973a8c (diff)
downloadlibgit2-ec1ce4584a6a8ec2b5b227301a918548907a2b02.tar.gz
http: send the DER-encoded cert to the callback
Instead of the parsed data, we can ask OpenSSL to give us the DER-encoded version of the certificate, which the user can then parse and validate.
Diffstat (limited to 'include')
-rw-r--r--include/git2/transport.h5
-rw-r--r--include/git2/types.h3
2 files changed, 4 insertions, 4 deletions
diff --git a/include/git2/transport.h b/include/git2/transport.h
index cd4429fee..7365cffdf 100644
--- a/include/git2/transport.h
+++ b/include/git2/transport.h
@@ -26,10 +26,9 @@ GIT_BEGIN_DECL
typedef enum git_cert_t {
/**
* The `data` argument to the callback will be a pointer to
- * OpenSSL's `X509` structure.
+ * the DER-encoded data.
*/
- GIT_CERT_X509_OPENSSL,
- GIT_CERT_X509_WINHTTP,
+ GIT_CERT_X509,
/**
* The `data` argument to the callback will be a pointer to a
* `git_cert_hostkey` structure.
diff --git a/include/git2/types.h b/include/git2/types.h
index 0009a8aa5..b574d2945 100644
--- a/include/git2/types.h
+++ b/include/git2/types.h
@@ -261,9 +261,10 @@ typedef enum git_cert_t git_cert_t;
*
* @param type The type of certificate or host info, SSH or X.509
* @param data The data for the certificate or host info
+ * @param len The size of the certificate or host info
* @param payload Payload provided by the caller
*/
-typedef int (*git_transport_certificate_check_cb)(git_cert_t type, void *data, void *payload);
+typedef int (*git_transport_certificate_check_cb)(git_cert_t type, void *data, size_t len, void *payload);
/**
* Opaque structure representing a submodule.