You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2018/10/09 18:55:17 UTC
svn commit: r1843328 -
/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
Author: markt
Date: Tue Oct 9 18:55:17 2018
New Revision: 1843328
URL: http://svn.apache.org/viewvc?rev=1843328&view=rev
Log:
Fix unused code warning
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java?rev=1843328&r1=1843327&r2=1843328&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java Tue Oct 9 18:55:17 2018
@@ -90,7 +90,7 @@ public class CertificateStreamProvider e
String alias = cert.getSubjectX500Principal().getName();
keyStore.setKeyEntry(alias, privKey, clientKeyPassword, new Certificate[]{cert});
- KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
+ KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(clientKeyAlgo);
keyManagerFactory.init(keyStore, clientKeyPassword);
return keyManagerFactory.getKeyManagers();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1843328 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
Posted by Rémy Maucherat <re...@apache.org>.
On Tue, Oct 9, 2018 at 9:05 PM Mark Thomas <ma...@apache.org> wrote:
> On 09/10/18 19:58, Rémy Maucherat wrote:
> > On Tue, Oct 9, 2018 at 8:56 PM Mark Thomas <ma...@apache.org> wrote:
> >
> >> On 09/10/18 19:55, markt@apache.org wrote:
> >>> Author: markt
> >>> Date: Tue Oct 9 18:55:17 2018
> >>> New Revision: 1843328
> >>>
> >>> URL: http://svn.apache.org/viewvc?rev=1843328&view=rev
> >>> Log:
> >>> Fix unused code warning
> >>
> >> My IDE popped up a warning that this parameter was unused. I think I
> >> have fixed this correctly but additional review would be good here.
> >>
> >
> > Good idea. My own IDE never cares about anything.
>
> Some further testing suggests my change wasn't what was intended (since
> there is a hard-coded default of "RSA" set further up the stack and that
> is an invalid value here). Was was intended? I can't see anywhere else
> where clientKeyAlgo could be used.
>
Ok, so it's because the jgroups code doesn't use our PEMFile to get the
private key, and it tries three key algorithms until it works. I can add
the ability in the PEMFile to pass that parameter (one extra constructor),
or forget about it and keep it as is.
Rémy
Re: svn commit: r1843328 -
/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
Posted by Mark Thomas <ma...@apache.org>.
On 09/10/18 19:58, Rémy Maucherat wrote:
> On Tue, Oct 9, 2018 at 8:56 PM Mark Thomas <ma...@apache.org> wrote:
>
>> On 09/10/18 19:55, markt@apache.org wrote:
>>> Author: markt
>>> Date: Tue Oct 9 18:55:17 2018
>>> New Revision: 1843328
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1843328&view=rev
>>> Log:
>>> Fix unused code warning
>>
>> My IDE popped up a warning that this parameter was unused. I think I
>> have fixed this correctly but additional review would be good here.
>>
>
> Good idea. My own IDE never cares about anything.
Some further testing suggests my change wasn't what was intended (since
there is a hard-coded default of "RSA" set further up the stack and that
is an invalid value here). Was was intended? I can't see anywhere else
where clientKeyAlgo could be used.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1843328 - /tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
Posted by Rémy Maucherat <re...@apache.org>.
On Tue, Oct 9, 2018 at 8:56 PM Mark Thomas <ma...@apache.org> wrote:
> On 09/10/18 19:55, markt@apache.org wrote:
> > Author: markt
> > Date: Tue Oct 9 18:55:17 2018
> > New Revision: 1843328
> >
> > URL: http://svn.apache.org/viewvc?rev=1843328&view=rev
> > Log:
> > Fix unused code warning
>
> My IDE popped up a warning that this parameter was unused. I think I
> have fixed this correctly but additional review would be good here.
>
Good idea. My own IDE never cares about anything.
Rémy
Re: svn commit: r1843328 -
/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
Posted by Mark Thomas <ma...@apache.org>.
On 09/10/18 19:55, markt@apache.org wrote:
> Author: markt
> Date: Tue Oct 9 18:55:17 2018
> New Revision: 1843328
>
> URL: http://svn.apache.org/viewvc?rev=1843328&view=rev
> Log:
> Fix unused code warning
My IDE popped up a warning that this parameter was unused. I think I
have fixed this correctly but additional review would be good here.
Mark
>
> Modified:
> tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
>
> Modified: tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java
> URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java?rev=1843328&r1=1843327&r2=1843328&view=diff
> ==============================================================================
> --- tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/tribes/membership/cloud/CertificateStreamProvider.java Tue Oct 9 18:55:17 2018
> @@ -90,7 +90,7 @@ public class CertificateStreamProvider e
> String alias = cert.getSubjectX500Principal().getName();
> keyStore.setKeyEntry(alias, privKey, clientKeyPassword, new Certificate[]{cert});
>
> - KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm());
> + KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(clientKeyAlgo);
> keyManagerFactory.init(keyStore, clientKeyPassword);
>
> return keyManagerFactory.getKeyManagers();
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org