diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2015-06-19 16:04:59 +0100 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2015-06-19 16:04:59 +0100 |
commit | 6bc8d84e4b0527f680b78a9a0c808cda74d4933d (patch) | |
tree | 835056047b4bde36f8d67b1656fa8dab8f6e1c6d /gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java | |
parent | 591da8d224ab68474c4600d42fc74bafe974303a (diff) | |
download | classpath-6bc8d84e4b0527f680b78a9a0c808cda74d4933d.tar.gz |
Mention PR66376.
2015-06-19 Andrew John Hughes <gnu_andrew@member.fsf.org>
* NEWS: Mention PR66376.
Diffstat (limited to 'gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java')
-rw-r--r-- | gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java b/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java index 1de3f8124..6c53ed66a 100644 --- a/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java +++ b/gnu/javax/net/ssl/provider/ServerDHE_PSKParameters.java @@ -1,5 +1,5 @@ /* ServerDHE_PSKParameters.java -- - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2015 Free Software Foundation, Inc. This file is a part of GNU Classpath. @@ -57,7 +57,7 @@ import java.nio.charset.Charset; * * @author Casey Marshall (csm@gnu.org) */ -public class ServerDHE_PSKParameters implements Constructed, Builder, ServerKeyExchangeParams +public class ServerDHE_PSKParameters implements Builder, ServerKeyExchangeParams { private ByteBuffer buffer; @@ -81,6 +81,7 @@ public class ServerDHE_PSKParameters implements Constructed, Builder, ServerKeyE buffer.put(dhParams); } + @Override public KeyExchangeAlgorithm algorithm() { return KeyExchangeAlgorithm.DHE_PSK; @@ -89,6 +90,7 @@ public class ServerDHE_PSKParameters implements Constructed, Builder, ServerKeyE /* (non-Javadoc) * @see gnu.javax.net.ssl.provider.Constructed#length() */ + @Override public int length() { return (buffer.getShort(0) & 0xFFFF) + 2 + params().length(); @@ -115,6 +117,7 @@ public class ServerDHE_PSKParameters implements Constructed, Builder, ServerKeyE /* (non-Javadoc) * @see gnu.javax.net.ssl.provider.Builder#buffer() */ + @Override public ByteBuffer buffer() { return (ByteBuffer) buffer.duplicate().rewind().limit(length()); @@ -128,6 +131,7 @@ public class ServerDHE_PSKParameters implements Constructed, Builder, ServerKeyE /* (non-Javadoc) * @see gnu.javax.net.ssl.provider.Constructed#toString(java.lang.String) */ + @Override public String toString(String prefix) { StringWriter str = new StringWriter(); |