Skip to content
Permalink
Browse files

Automatic merge of jdk:master into master

  • Loading branch information
duke committed Jul 24, 2020
2 parents 23e70a7 + 5db5834 commit b5342f05fa911b7aee51f8305cc0b6b602fadcd5
Showing with 170 additions and 25 deletions.
  1. +6 −1 src/java.base/share/classes/java/security/AlgorithmParameterGeneratorSpi.java
  2. +6 −1 src/java.base/share/classes/java/security/AlgorithmParametersSpi.java
  3. +5 −0 src/java.base/share/classes/java/security/KeyFactorySpi.java
  4. +6 −1 src/java.base/share/classes/java/security/KeyPairGeneratorSpi.java
  5. +6 −1 src/java.base/share/classes/java/security/KeyStoreSpi.java
  6. +6 −1 src/java.base/share/classes/java/security/MessageDigestSpi.java
  7. +6 −1 src/java.base/share/classes/java/security/PermissionCollection.java
  8. +6 −1 src/java.base/share/classes/java/security/Policy.java
  9. +6 −1 src/java.base/share/classes/java/security/PolicySpi.java
  10. +5 −0 src/java.base/share/classes/java/security/SignatureSpi.java
  11. +6 −1 src/java.base/share/classes/java/security/cert/CertificateFactorySpi.java
  12. +6 −1 src/java.base/share/classes/java/security/cert/X509CRLEntry.java
  13. +6 −1 src/java.base/share/classes/javax/crypto/CipherSpi.java
  14. +6 −1 src/java.base/share/classes/javax/crypto/ExemptionMechanismSpi.java
  15. +6 −1 src/java.base/share/classes/javax/crypto/KeyAgreementSpi.java
  16. +6 −1 src/java.base/share/classes/javax/crypto/KeyGeneratorSpi.java
  17. +6 −1 src/java.base/share/classes/javax/crypto/MacSpi.java
  18. +6 −1 src/java.base/share/classes/javax/crypto/SecretKeyFactorySpi.java
  19. +6 −1 src/java.base/share/classes/javax/security/auth/login/ConfigurationSpi.java
  20. +6 −1 src/java.base/share/classes/javax/security/cert/Certificate.java
  21. +5 −0 src/java.base/share/classes/javax/security/cert/X509Certificate.java
  22. +6 −1 src/java.security.jgss/share/classes/org/ietf/jgss/GSSManager.java
  23. +6 −1 src/jdk.security.auth/share/classes/com/sun/security/auth/module/JndiLoginModule.java
  24. +6 −1 src/jdk.security.auth/share/classes/com/sun/security/auth/module/KeyStoreLoginModule.java
  25. +5 −0 src/jdk.security.auth/share/classes/com/sun/security/auth/module/Krb5LoginModule.java
  26. +6 −1 src/jdk.security.auth/share/classes/com/sun/security/auth/module/LdapLoginModule.java
  27. +6 −1 src/jdk.security.auth/share/classes/com/sun/security/auth/module/NTLoginModule.java
  28. +6 −1 src/jdk.security.auth/share/classes/com/sun/security/auth/module/UnixLoginModule.java
  29. +6 −1 src/jdk.security.jgss/share/classes/com/sun/security/jgss/GSSUtil.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@@ -60,6 +60,11 @@

public abstract class AlgorithmParameterGeneratorSpi {

/**
* Constructor for subclasses to call.
*/
public AlgorithmParameterGeneratorSpi() {}

/**
* Initializes this parameter generator for a certain size
* and source of randomness.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@@ -50,6 +50,11 @@

public abstract class AlgorithmParametersSpi {

/**
* Constructor for subclasses to call.
*/
public AlgorithmParametersSpi() {}

/**
* Initializes this parameters object using the parameters
* specified in {@code paramSpec}.
@@ -69,6 +69,11 @@

public abstract class KeyFactorySpi {

/**
* Constructor for subclasses to call.
*/
public KeyFactorySpi() {}

/**
* Generates a public key object from the provided key
* specification (key material).
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@@ -58,6 +58,11 @@

public abstract class KeyPairGeneratorSpi {

/**
* Constructor for subclasses to call.
*/
public KeyPairGeneratorSpi() {}

/**
* Initializes the key pair generator for a certain keysize, using
* the default parameter set.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2020, 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
@@ -53,6 +53,11 @@

public abstract class KeyStoreSpi {

/**
* Constructor for subclasses to call.
*/
public KeyStoreSpi() {}

/**
* Returns the key associated with the given alias, using the given
* password to recover it. The key must have been associated with
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@@ -54,6 +54,11 @@
// for re-use in engineUpdate(ByteBuffer input)
private byte[] tempArray;

/**
* Constructor for subclasses to call.
*/
public MessageDigestSpi() {}

/**
* Returns the digest length in bytes.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@@ -102,6 +102,11 @@
// when set, add will throw an exception.
private volatile boolean readOnly;

/**
* Constructor for subclasses to call.
*/
public PermissionCollection() {}

/**
* Adds a permission object to the current collection of permission objects.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@@ -87,6 +87,11 @@

public abstract class Policy {

/**
* Constructor for subclasses to call.
*/
public Policy() {}

/**
* A read-only empty PermissionCollection instance.
* @since 1.6
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2020, 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
@@ -44,6 +44,11 @@

public abstract class PolicySpi {

/**
* Constructor for subclasses to call.
*/
public PolicySpi() {}

/**
* Check whether the policy has granted a Permission to a ProtectionDomain.
*
@@ -52,6 +52,11 @@

public abstract class SignatureSpi {

/**
* Constructor for subclasses to call.
*/
public SignatureSpi() {}

/**
* Application-specified source of randomness.
*/
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2020, 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
@@ -65,6 +65,11 @@

public abstract class CertificateFactorySpi {

/**
* Constructor for subclasses to call.
*/
public CertificateFactorySpi() {}

/**
* Generates a certificate object and initializes it with
* the data read from the input stream {@code inStream}.
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@@ -67,6 +67,11 @@

public abstract class X509CRLEntry implements X509Extension {

/**
* Constructor for subclasses to call.
*/
public X509CRLEntry() {}

/**
* Compares this CRL entry for equality with the given
* object. If the {@code other} object is an
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@@ -229,6 +229,11 @@

public abstract class CipherSpi {

/**
* Constructor for subclasses to call.
*/
public CipherSpi() {}

/**
* Sets the mode of this cipher.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2020, 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
@@ -45,6 +45,11 @@

public abstract class ExemptionMechanismSpi {

/**
* Constructor for subclasses to call.
*/
public ExemptionMechanismSpi() {}

/**
* Returns the length in bytes that an output buffer would need to be in
* order to hold the result of the next
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@@ -62,6 +62,11 @@

public abstract class KeyAgreementSpi {

/**
* Constructor for subclasses to call.
*/
public KeyAgreementSpi() {}

/**
* Initializes this key agreement with the given key and source of
* randomness. The given key is required to contain all the algorithm
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@@ -55,6 +55,11 @@

public abstract class KeyGeneratorSpi {

/**
* Constructor for subclasses to call.
*/
public KeyGeneratorSpi() {}

/**
* Initializes the key generator.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2007, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2020, 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
@@ -46,6 +46,11 @@

public abstract class MacSpi {

/**
* Constructor for subclasses to call.
*/
public MacSpi() {}

/**
* Returns the length of the MAC in bytes.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@@ -53,6 +53,11 @@

public abstract class SecretKeyFactorySpi {

/**
* Constructor for subclasses to call.
*/
public SecretKeyFactorySpi() {}

/**
* Generates a <code>SecretKey</code> object from the
* provided key specification (key material).
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2020, 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
@@ -43,6 +43,11 @@
*/

public abstract class ConfigurationSpi {
/**
* Constructor for subclasses to call.
*/
public ConfigurationSpi() {}

/**
* Retrieve the AppConfigurationEntries for the specified {@code name}.
*
@@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2020, 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
@@ -65,6 +65,11 @@
@Deprecated(since="9", forRemoval=true)
public abstract class Certificate {

/**
* Constructor for subclasses to call.
*/
public Certificate() {}

/**
* Compares this certificate for equality with the specified
* object. If the {@code other} object is an
@@ -130,6 +130,11 @@
@Deprecated(since="9", forRemoval=true)
public abstract class X509Certificate extends Certificate {

/**
* Constructor for subclasses to call.
*/
public X509Certificate() {}

/**
* Constant to lookup in the Security properties file.
* In the Security properties file the default implementation
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 2020, 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
@@ -138,6 +138,11 @@
*/
public abstract class GSSManager {

/**
* Constructor for subclasses to call.
*/
public GSSManager() {}

/**
* Returns the default GSSManager implementation.
*

0 comments on commit b5342f0

Please sign in to comment.