src/share/lib/security/java.security

rev 10364 : 6997010: Consolidate java.security files into one file with modifications

*** 63,83 ****
  # class.
  
  #
  # List of providers and their preference orders (see above):
  #
! security.provider.1=com.oracle.security.ucrypto.UcryptoProvider ${java.home}/lib/security/ucrypto-solaris.cfg
! security.provider.2=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/sunpkcs11-solaris.cfg
! security.provider.3=sun.security.provider.Sun
! security.provider.4=sun.security.rsa.SunRsaSign
! security.provider.5=sun.security.ec.SunEC
! security.provider.6=com.sun.net.ssl.internal.ssl.Provider
! security.provider.7=com.sun.crypto.provider.SunJCE
! security.provider.8=sun.security.jgss.SunProvider
! security.provider.9=com.sun.security.sasl.Provider
! security.provider.10=org.jcp.xml.dsig.internal.dom.XMLDSigRI
! security.provider.11=sun.security.smartcardio.SunPCSC
  
  #
  # Sun Provider SecureRandom seed source.
  #
  # Select the primary source of seed data for the "SHA1PRNG" and
--- 63,91 ----
  # class.
  
  #
  # List of providers and their preference orders (see above):
  #
! #ifdef solaris
! security.provider.tbd=com.oracle.security.ucrypto.UcryptoProvider ${java.home}/lib/security/ucrypto-solaris.cfg
! security.provider.tbd=sun.security.pkcs11.SunPKCS11 ${java.home}/lib/security/sunpkcs11-solaris.cfg
! #endif
! security.provider.tbd=sun.security.provider.Sun
! security.provider.tbd=sun.security.rsa.SunRsaSign
! security.provider.tbd=sun.security.ec.SunEC
! security.provider.tbd=com.sun.net.ssl.internal.ssl.Provider
! security.provider.tbd=com.sun.crypto.provider.SunJCE
! security.provider.tbd=sun.security.jgss.SunProvider
! security.provider.tbd=com.sun.security.sasl.Provider
! security.provider.tbd=org.jcp.xml.dsig.internal.dom.XMLDSigRI
! security.provider.tbd=sun.security.smartcardio.SunPCSC
! #ifdef windows
! security.provider.tbd=sun.security.mscapi.SunMSCAPI
! #endif
! #ifdef macosx
! security.provider.tbd=apple.security.AppleProvider
! #endif
  
  #
  # Sun Provider SecureRandom seed source.
  #
  # Select the primary source of seed data for the "SHA1PRNG" and
*** 126,136 ****
--- 134,149 ----
  # indicate a list of known strong implementations using the property.
  #
  # This is a comma-separated list of algorithm and/or algorithm:provider
  # entries.
  #
+ #ifdef windows
+ securerandom.strongAlgorithms=Windows-PRNG:SunMSCAPI,SHA1PRNG:SUN
+ #endif
+ #ifndef windows
  securerandom.strongAlgorithms=NativePRNGBlocking:SUN
+ #endif
  
  #
  # Class to instantiate as the javax.security.auth.login.Configuration
  # provider.
  #
*** 210,220 ****
                 com.oracle.webservices.internal.,\
                 org.jcp.xml.dsig.internal.,\
                 jdk.internal.,\
                 jdk.nashorn.internal.,\
                 jdk.nashorn.tools.,\
!                com.sun.activation.registries.
  
  #
  # List of comma-separated packages that start with or equal this string
  # will cause a security exception to be thrown when
  # passed to checkPackageDefinition unless the
--- 223,236 ----
                 com.oracle.webservices.internal.,\
                 org.jcp.xml.dsig.internal.,\
                 jdk.internal.,\
                 jdk.nashorn.internal.,\
                 jdk.nashorn.tools.,\
!                com.sun.activation.registries.,\
! #ifdef macosx
!                apple.,\
! #endif
  
  #
  # List of comma-separated packages that start with or equal this string
  # will cause a security exception to be thrown when
  # passed to checkPackageDefinition unless the
*** 256,266 ****
                     com.oracle.webservices.internal.,\
                     org.jcp.xml.dsig.internal.,\
                     jdk.internal.,\
                     jdk.nashorn.internal.,\
                     jdk.nashorn.tools.,\
!                    com.sun.activation.registries.
  
  #
  # Determines whether this properties file can be appended to
  # or overridden on the command line via -Djava.security.properties
  #
--- 272,285 ----
                     com.oracle.webservices.internal.,\
                     org.jcp.xml.dsig.internal.,\
                     jdk.internal.,\
                     jdk.nashorn.internal.,\
                     jdk.nashorn.tools.,\
!                    com.sun.activation.registries.,\
! #ifdef macosx
!                    apple.,\
! #endif
  
  #
  # Determines whether this properties file can be appended to
  # or overridden on the command line via -Djava.security.properties
  #