Skip to content
Permalink
Browse files
Fix namespace prefix on get_cert_sha1 function
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
David Woodhouse authored and David Woodhouse committed Mar 9, 2011
1 parent 8f1c03a commit 20840ab058b242482785022292d959a0a673c7e4
Showing with 6 additions and 6 deletions.
  1. +1 −1 main.c
  2. +2 −2 nm-auth-dialog.c
  3. +1 −1 openconnect.h
  4. +2 −2 ssl.c
2 main.c
@@ -630,7 +630,7 @@ static int validate_peer_cert(struct openconnect_info *vpninfo, X509 *peer_cert,
if (nocertcheck)
return 0;

ret = get_cert_sha1_fingerprint(vpninfo, peer_cert, fingerprint);
ret = openconnect_get_cert_sha1(vpninfo, peer_cert, fingerprint);
if (ret)
return ret;

@@ -697,7 +697,7 @@ static int validate_peer_cert(struct openconnect_info *vpninfo,
int ret = 0;
cert_data *data;

ret = get_cert_sha1_fingerprint(vpninfo, peer_cert, fingerprint);
ret = openconnect_get_cert_sha1(vpninfo, peer_cert, fingerprint);
if (ret)
return ret;

@@ -1080,7 +1080,7 @@ static void print_peer_cert(struct openconnect_info *vpninfo)
char fingerprint[EVP_MAX_MD_SIZE * 2 + 1];
X509 *cert = openconnect_get_peer_cert(vpninfo);

if (cert && !get_cert_sha1_fingerprint(vpninfo, cert, fingerprint))
if (cert && !openconnect_get_cert_sha1(vpninfo, cert, fingerprint))
printf("gwcert\n%s\n", fingerprint);
}

@@ -89,7 +89,7 @@ struct openconnect_info;
/* We don't want to have to pull in OpenSSL stuff just for this */
struct x509_st;

int get_cert_sha1_fingerprint(struct openconnect_info *vpninfo,
int openconnect_get_cert_sha1(struct openconnect_info *vpninfo,
struct x509_st *cert, char *buf);
int openconnect_set_http_proxy(struct openconnect_info *vpninfo, char *proxy);
int openconnect_passphrase_from_fsid(struct openconnect_info *vpninfo);
4 ssl.c
@@ -419,7 +419,7 @@ int get_cert_md5_fingerprint(struct openconnect_info *vpninfo,
return get_cert_fingerprint(vpninfo, cert, EVP_md5(), buf);
}

int get_cert_sha1_fingerprint(struct openconnect_info *vpninfo,
int openconnect_get_cert_sha1(struct openconnect_info *vpninfo,
X509 *cert, char *buf)
{
return get_cert_fingerprint(vpninfo, cert, EVP_sha1(), buf);
@@ -430,7 +430,7 @@ static int check_server_cert(struct openconnect_info *vpninfo, X509 *cert)
char fingerprint[EVP_MAX_MD_SIZE * 2 + 1];
int ret;

ret = get_cert_sha1_fingerprint(vpninfo, cert, fingerprint);
ret = openconnect_get_cert_sha1(vpninfo, cert, fingerprint);
if (ret)
return ret;

0 comments on commit 20840ab

Please sign in to comment.