Author: svn-role
Date: Tue Jan 30 04:00:05 2018
New Revision: 1822604
URL: http://svn.apache.org/viewvc?rev=1822604&view=rev
Log:
Merge r1820718 from trunk:
* r1820718
Fix JavaHL SSL server trust prompting to allow accepting temporarily.
Justification:
Cannot accept temporarily without this fix.
Votes:
+1: philip, rhuijben
Modified:
subversion/branches/1.10.x/ (props changed)
subversion/branches/1.10.x/STATUS
subversion/branches/1.10.x/subversion/bindings/javahl/native/Prompter.cpp
subversion/branches/1.10.x/tools/examples/ExampleAuthn.java
Propchange: subversion/branches/1.10.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 30 04:00:05 2018
@@ -99,4 +99,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820518,1821183,1821224
+/subversion/trunk:1817837,1817856,1818577-1818578,1818584,1818651,1818662,1818727,1818801,1818803,1818807,1818868,1818871,1819036-1819037,1819043,1819049,1819052,1819093,1819146,1819162,1819444,1819556-1819557,1819603,1819804,1819911,1820518,1820718,1821183,1821224
Modified: subversion/branches/1.10.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/STATUS?rev=1822604&r1=1822603&r2=1822604&view=diff
==============================================================================
--- subversion/branches/1.10.x/STATUS (original)
+++ subversion/branches/1.10.x/STATUS Tue Jan 30 04:00:05 2018
@@ -62,10 +62,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1820718
- Fix JavaHL SSL server trust prompting to allow accepting temporarily.
- Justification:
- Cannot accept temporarily without this fix.
- Votes:
- +1: philip, rhuijben
Modified:
subversion/branches/1.10.x/subversion/bindings/javahl/native/Prompter.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/subversion/bindings/javahl/native/Prompter.cpp?rev=1822604&r1=1822603&r2=1822604&view=diff
==============================================================================
--- subversion/branches/1.10.x/subversion/bindings/javahl/native/Prompter.cpp
(original)
+++ subversion/branches/1.10.x/subversion/bindings/javahl/native/Prompter.cpp
Tue Jan 30 04:00:05 2018
@@ -342,8 +342,7 @@ svn_error_t *Prompter::dispatch_ssl_serv
svn_auth_cred_ssl_server_trust_t *cred =
static_cast<svn_auth_cred_ssl_server_trust_t*>(apr_pcalloc(pool,
sizeof(*cred)));
cred->may_save = save;
- if (save)
- cred->accepted_failures = failures;
+ cred->accepted_failures = failures;
*cred_p = cred;
return SVN_NO_ERROR;
Modified: subversion/branches/1.10.x/tools/examples/ExampleAuthn.java
URL:
http://svn.apache.org/viewvc/subversion/branches/1.10.x/tools/examples/ExampleAuthn.java?rev=1822604&r1=1822603&r2=1822604&view=diff
==============================================================================
--- subversion/branches/1.10.x/tools/examples/ExampleAuthn.java (original)
+++ subversion/branches/1.10.x/tools/examples/ExampleAuthn.java Tue Jan 30
04:00:05 2018
@@ -68,8 +68,11 @@ public class ExampleAuthn {
SSLServerCertFailures failures,
SSLServerCertInfo info,
boolean maySave) {
- System.out.println("sslServerTrustPrompt not implemented!");
- return SSLServerTrustResult.acceptTemporarily();
+ System.out.println("sslServerTrustPrompt");
+ System.out.println("(r)eject or (t)emporary?");
+ String s = System.console().readLine();
+ return s.equals("t") ? SSLServerTrustResult.acceptTemporarily()
+ : SSLServerTrustResult.reject();
}
public SSLClientCertResult
