Fix namespace prefix on get_cert_sha1 function

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
sailfishos-mirror · Mar 9, 2011 · 20840ab · 20840ab
1 parent 8f1c03a
commit 20840ab
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/main.c b/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;
 

diff --git a/nm-auth-dialog.c b/nm-auth-dialog.c
@@ -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);
 }
 

diff --git a/openconnect.h b/openconnect.h
@@ -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);

diff --git a/ssl.c b/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;