summaryrefslogtreecommitdiff
path: root/resource
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2006-05-01 21:45:41 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2006-05-01 21:45:41 +0000
commit480ccb4bfcc622c1ce320c20ce992188187f7573 (patch)
treeaebfd0e230d0370ec1ac1a9b1a99b478abdc6854 /resource
parent4d80ae24073737202d4c51bf9efd2466fea8696d (diff)
downloadclasspath-480ccb4bfcc622c1ce320c20ce992188187f7573.tar.gz
2006-05-01 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge HEAD-->generics-branch for the period 2006-04-13 to 2006-05-01.
Diffstat (limited to 'resource')
-rw-r--r--resource/java/security/classpath.security3
1 files changed, 2 insertions, 1 deletions
diff --git a/resource/java/security/classpath.security b/resource/java/security/classpath.security
index cc7d49378..13d691bfe 100644
--- a/resource/java/security/classpath.security
+++ b/resource/java/security/classpath.security
@@ -35,8 +35,9 @@
# obligated to do so. If you do not wish to do so, delete this
# exception statement from your version.
-
+# Note that the settings and ordering here are mirrored in Security.
security.provider.1=gnu.java.security.provider.Gnu
security.provider.2=gnu.javax.crypto.jce.GnuCrypto
security.provider.3=gnu.javax.crypto.jce.GnuSasl
security.provider.4=gnu.javax.net.ssl.provider.Jessie
+security.provider.5=gnu.javax.security.auth.callback.GnuCallbacks