Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
Automatic merge of jdk:master into master
  • Loading branch information
duke committed Mar 8, 2021
2 parents 42387eb + 22a3117 commit d605bfb9a73ffb58364765ddcf188d6e5290afbe
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/java.base/share/classes/sun/security/ssl/RenegoInfoExtension.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -280,7 +280,7 @@ public void absent(ConnectionContext context,
CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV.id) {
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
SSLLogger.finest(
"Safe renegotiation, using the SCSV signgling");
"Safe renegotiation, using the SCSV signaling");
}
shc.conContext.secureRenegotiation = true;
return;
@@ -341,7 +341,7 @@ public byte[] produce(ConnectionContext context,
RenegotiationInfoSpec requestedSpec = (RenegotiationInfoSpec)
shc.handshakeExtensions.get(CH_RENEGOTIATION_INFO);
if (requestedSpec == null && !shc.conContext.secureRenegotiation) {
// Ignore, no renegotiation_info extension or SCSV signgling
// Ignore, no renegotiation_info extension or SCSV signaling
// requested.
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
SSLLogger.finest(

0 comments on commit d605bfb

Please sign in to comment.