Mercurial > hg > openjdk > jigsaw > jdk
changeset 4358:d64f9348c7ca
6931562: Support SunMSCAPI Security Provider in Windows 64-bit releases of JVM
Reviewed-by: mullan
author | vinnie |
---|---|
date | Fri, 22 Apr 2011 17:03:51 +0100 |
parents | 9cc0045191ed |
children | 8b36b1c4bb7f 5a4e2a734f1d |
files | make/java/security/Makefile make/sun/security/Makefile test/sun/security/mscapi/AccessKeyStore.sh test/sun/security/mscapi/IsSunMSCAPIAvailable.sh test/sun/security/mscapi/KeyStoreCompatibilityMode.sh test/sun/security/mscapi/KeytoolChangeAlias.sh test/sun/security/mscapi/RSAEncryptDecrypt.sh |
diffstat | 7 files changed, 16 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/make/java/security/Makefile Fri Apr 22 08:46:51 2011 -0700 +++ b/make/java/security/Makefile Fri Apr 22 17:03:51 2011 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2011 Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 2011, 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,11 +44,9 @@ else # PLATFORM -# Register Microsoft CryptoAPI provider only on (non-64-bit) Windows platform. +# Register Microsoft CryptoAPI provider only on Windows platform. ifeq ($(PLATFORM), windows) - ifneq ($(ARCH_DATA_MODEL), 64) - PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows - endif + PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows endif endif # PLATFORM
--- a/make/sun/security/Makefile Fri Apr 22 08:46:51 2011 -0700 +++ b/make/sun/security/Makefile Fri Apr 22 17:03:51 2011 +0100 @@ -1,5 +1,5 @@ # -# Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1996, 2011, 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 @@ -52,12 +52,10 @@ endif endif -# Build Microsoft CryptoAPI provider only on (non-64-bit) Windows platform. +# Build Microsoft CryptoAPI provider only on Windows platform. MSCAPI = ifeq ($(PLATFORM), windows) - ifneq ($(ARCH_DATA_MODEL), 64) - MSCAPI = mscapi - endif + MSCAPI = mscapi endif # Build in-tree elliptic curve crypto provider only when
--- a/test/sun/security/mscapi/AccessKeyStore.sh Fri Apr 22 08:46:51 2011 -0700 +++ b/test/sun/security/mscapi/AccessKeyStore.sh Fri Apr 22 17:03:51 2011 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -25,11 +25,9 @@ # @test -# @bug 6324295 +# @bug 6324295 6931562 # @run shell AccessKeyStore.sh # @summary Confirm that permission must be granted to access keystores. -# -# Run only on non-64-bit Windows platform. OS=`uname -s` case "$OS" in
--- a/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh Fri Apr 22 08:46:51 2011 -0700 +++ b/test/sun/security/mscapi/IsSunMSCAPIAvailable.sh Fri Apr 22 17:03:51 2011 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -25,11 +25,9 @@ # @test -# @bug 6318171 +# @bug 6318171 6931562 # @run shell IsSunMSCAPIAvailable.sh # @summary Basic test of the Microsoft CryptoAPI provider. -# -# Run only on non-64-bit Windows platform. OS=`uname -s` case "$OS" in
--- a/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh Fri Apr 22 08:46:51 2011 -0700 +++ b/test/sun/security/mscapi/KeyStoreCompatibilityMode.sh Fri Apr 22 17:03:51 2011 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2005, 2011, 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 @@ -25,12 +25,10 @@ # @test -# @bug 6324294 +# @bug 6324294 6931562 # @run shell KeyStoreCompatibilityMode.sh # @summary Confirm that a null stream or password is not permitted when # compatibility mode is enabled (and vice versa). -# -# Run only on non-64-bit Windows platform. OS=`uname -s` case "$OS" in
--- a/test/sun/security/mscapi/KeytoolChangeAlias.sh Fri Apr 22 08:46:51 2011 -0700 +++ b/test/sun/security/mscapi/KeytoolChangeAlias.sh Fri Apr 22 17:03:51 2011 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2011, 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 @@ -25,11 +25,9 @@ # @test -# @bug 6415696 +# @bug 6415696 6931562 # @run shell KeytoolChangeAlias.sh # @summary Test "keytool -changealias" using the Microsoft CryptoAPI provider. -# -# Run only on non-64-bit Windows platform. # set a few environment variables so that the shell-script can run stand-alone # in the source directory
--- a/test/sun/security/mscapi/RSAEncryptDecrypt.sh Fri Apr 22 08:46:51 2011 -0700 +++ b/test/sun/security/mscapi/RSAEncryptDecrypt.sh Fri Apr 22 17:03:51 2011 +0100 @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (c) 2006, 2007, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2011, 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 @@ -24,13 +24,11 @@ # # @test -# @bug 6457422 +# @bug 6457422 6931562 # @run shell RSAEncryptDecrypt.sh # @summary Confirm that plaintext can be encrypted and then decrypted using the # RSA cipher in the SunMSCAPI crypto provider. NOTE: The RSA cipher is # absent from the SunMSCAPI provider in OpenJDK builds. -# -# Run only on non-64-bit Windows platform. # set a few environment variables so that the shell-script can run stand-alone # in the source directory