tomaswolf commented on a change in pull request #184: URL: https://github.com/apache/mina-sshd/pull/184#discussion_r599733904
########## File path: sshd-core/src/main/java/org/apache/sshd/common/kex/extension/DefaultClientKexExtensionHandler.java ########## @@ -52,247 +43,111 @@ * session by adding the <A HREF="https://tools.ietf.org/html/rfc8332";>"rsa-sha2-256/512"</A> signature * factories (if not already added). * - * <B>Note:</B> experimental - used for development purposes and as an example - * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ public class DefaultClientKexExtensionHandler extends AbstractLoggingBean implements KexExtensionHandler { - /** - * Session {@link AttributeKey} used to store the client's proposal - */ - public static final AttributeKey<Map<KexProposalOption, String>> CLIENT_PROPOSAL_KEY = new AttributeKey<>(); + + /** Default singleton instance. */ + public static final DefaultClientKexExtensionHandler INSTANCE = new DefaultClientKexExtensionHandler(); /** - * Session {@link AttributeKey} used to store the server's proposal + * Session {@link AttributeKey} used to store whether the extension indicator was already sent. */ - public static final AttributeKey<Map<KexProposalOption, String>> SERVER_PROPOSAL_KEY = new AttributeKey<>(); - - public static final NavigableSet<String> DEFAULT_EXTRA_SIGNATURES = Collections.unmodifiableNavigableSet( - GenericUtils.asSortedSet(String.CASE_INSENSITIVE_ORDER, - KeyUtils.RSA_SHA256_KEY_TYPE_ALIAS, - KeyUtils.RSA_SHA512_KEY_TYPE_ALIAS)); - - public static final DefaultClientKexExtensionHandler INSTANCE = new DefaultClientKexExtensionHandler(); + private static final AttributeKey<Boolean> CLIENT_PROPOSAL_MADE = new AttributeKey<>(); Review comment: I had asked Guillaume a while ago about where I should commit/merge; he said he just pushed to the Github repo and that worked for him. There's also a number of commits at gitbox that are PR merges. So I gathered that indeed simply merging PRs the usual Github way would work. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
