You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2016/01/19 15:07:00 UTC

qpid-proton git commit: PROTON-1088 - Additional fix, added schannel.c and ssl_stub.c stubs

Repository: qpid-proton
Updated Branches:
  refs/heads/master 817083ee7 -> 1b3e5512f


PROTON-1088 - Additional fix, added schannel.c and ssl_stub.c stubs


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/1b3e5512
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/1b3e5512
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/1b3e5512

Branch: refs/heads/master
Commit: 1b3e5512fd6fbb04d50623f06c2ace6a53130f9f
Parents: 817083e
Author: ganeshmurthy <gm...@redhat.com>
Authored: Mon Jan 18 16:33:19 2016 -0500
Committer: ganeshmurthy <gm...@redhat.com>
Committed: Mon Jan 18 16:33:19 2016 -0500

----------------------------------------------------------------------
 proton-c/src/ssl/ssl_stub.c      | 10 ++++++++++
 proton-c/src/windows/schannel.c  | 13 +++++++++++++
 tests/python/proton_tests/ssl.py |  3 +++
 3 files changed, 26 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1b3e5512/proton-c/src/ssl/ssl_stub.c
----------------------------------------------------------------------
diff --git a/proton-c/src/ssl/ssl_stub.c b/proton-c/src/ssl/ssl_stub.c
index f504a79..c836b59 100644
--- a/proton-c/src/ssl/ssl_stub.c
+++ b/proton-c/src/ssl/ssl_stub.c
@@ -147,3 +147,13 @@ int pn_ssl_get_ssf(pn_ssl_t *ssl)
 {
   return 0;
 }
+
+int pn_ssl_get_cert_fingerprint(pn_ssl_t *ssl0, char *fingerprint, size_t fingerprint_length, pn_ssl_hash_alg hash_alg)
+{
+    return -1;
+}
+
+const char* pn_ssl_get_remote_subject_subfield(pn_ssl_t *ssl0, pn_ssl_cert_subject_subfield field)
+{
+    return NULL;
+}

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1b3e5512/proton-c/src/windows/schannel.c
----------------------------------------------------------------------
diff --git a/proton-c/src/windows/schannel.c b/proton-c/src/windows/schannel.c
index 7de629f..fa9c2d1 100644
--- a/proton-c/src/windows/schannel.c
+++ b/proton-c/src/windows/schannel.c
@@ -1983,6 +1983,19 @@ static bool server_name_matches(const char *server_name, CERT_EXTENSION *alt_nam
   return matched;
 }
 
+const char* pn_ssl_get_remote_subject_subfield(pn_ssl_t *ssl0, pn_ssl_cert_subject_subfield field)
+{
+    return NULL;
+}
+
+int pn_ssl_get_cert_fingerprint(pn_ssl_t *ssl0,
+                                          char *fingerprint,
+                                          size_t fingerprint_length,
+                                          pn_ssl_hash_alg hash_alg)
+{
+    return -1;
+}
+
 static HRESULT verify_peer(pni_ssl_t *ssl, HCERTSTORE root_store, const char *server_name, bool tracing)
 {
   // Free/release the following before return:

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/1b3e5512/tests/python/proton_tests/ssl.py
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/ssl.py b/tests/python/proton_tests/ssl.py
index 54f5074..52ccd1f 100644
--- a/tests/python/proton_tests/ssl.py
+++ b/tests/python/proton_tests/ssl.py
@@ -186,6 +186,9 @@ class SslTest(common.Test):
         self._pump( client, server )
 
     def test_certificate_fingerprint_and_subfields(self):
+        if os.name=="nt":
+            raise Skipped("Windows support for certificate fingerprint and subfield not implemented yet")
+
         if "java" in sys.platform:
             raise Skipped("Not yet implemented in Proton-J")
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org