Author: brane
Date: Tue Nov 18 13:12:13 2014
New Revision: 1640328
URL: http://svn.apache.org/r1640328
Log:
On the svn-auth-x509 branch: Update JavaHL to the latest svn_x509 API.
[subversion/bindings/javahl]
* native/AuthnCallback.cpp
(AuthnCallback::SSLServerCertInfo::SSLServerCertInfo):
Pass a result pool to svn_x509_certinfo_get_subject.
Use the correct function to get the certificate issuer.
* org_apache_subversion_javahl_util_ConfigLib.cpp
(Java_org_apache_subversion_javahl_util_ConfigLib_nativeSearchCredentials):
Pass a result pool to svn_x509_certinfo_get_subject and
svn_x509_certinfo_get_issuer.
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/AuthnCallback.cpp
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/AuthnCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/AuthnCallback.cpp?rev=1640328&r1=1640327&r2=1640328&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/AuthnCallback.cpp
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/AuthnCallback.cpp
Tue Nov 18 13:12:13 2014
@@ -208,8 +208,10 @@ AuthnCallback::SSLServerCertInfo::SSLSer
SVN_JAVAHL_CHECK(env, svn_x509_parse_cert(&certinfo, der->data, der->len,
pool.getPool(), pool.getPool()));
- const ::Java::String subject(env, svn_x509_certinfo_get_subject(certinfo));
- const ::Java::String issuer(env, svn_x509_certinfo_get_subject(certinfo));
+ const ::Java::String subject(
+ env, svn_x509_certinfo_get_subject(certinfo, pool.getPool()));
+ const ::Java::String issuer(
+ env, svn_x509_certinfo_get_issuer(certinfo, pool.getPool()));
const ::Java::String cert(env, ascii_cert);
const jlong valid_from =
(jlong(svn_x509_certinfo_get_valid_from(certinfo)) + 500) / 1000;
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp?rev=1640328&r1=1640327&r2=1640328&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigLib.cpp
Tue Nov 18 13:12:13 2014
@@ -424,8 +424,10 @@ Java_org_apache_subversion_javahl_util_C
}
else
{
- subject = svn_x509_certinfo_get_subject(certinfo);
- issuer = svn_x509_certinfo_get_issuer(certinfo);
+ subject = svn_x509_certinfo_get_subject(
+ certinfo, cb_scratch_pool);
+ issuer = svn_x509_certinfo_get_issuer(
+ certinfo, cb_scratch_pool);
fingerprint = svn_checksum_to_cstring_display(
svn_x509_certinfo_get_digest(certinfo),
cb_scratch_pool);
