diff options
| author | jmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-03-17 01:05:36 +0000 |
|---|---|---|
| committer | jmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2009-03-17 01:05:36 +0000 |
| commit | 01262e4a674c88edfa303cdb0366c8a636d24f79 (patch) | |
| tree | 008c31c58c1d8c81bd4685cc48801a2471f3d40c | |
| parent | 57b271b83290c94d04deb1848c48fe7355e0d650 (diff) | |
Fix for Bug#489011, 330J key changeover support.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@299 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
| -rw-r--r-- | pki/base/symkey/src/com/netscape/symkey/SymKey.cpp | 2 | ||||
| -rw-r--r-- | pki/base/tps/src/channel/Secure_Channel.cpp | 6 | ||||
| -rw-r--r-- | pki/dogtag/symkey/symkey.spec | 4 | ||||
| -rw-r--r-- | pki/dogtag/tps/pki-tps.spec | 4 |
4 files changed, 13 insertions, 3 deletions
diff --git a/pki/base/symkey/src/com/netscape/symkey/SymKey.cpp b/pki/base/symkey/src/com/netscape/symkey/SymKey.cpp index d5b5ee917..11e363436 100644 --- a/pki/base/symkey/src/com/netscape/symkey/SymKey.cpp +++ b/pki/base/symkey/src/com/netscape/symkey/SymKey.cpp @@ -976,7 +976,7 @@ extern "C" JNIEXPORT jbyteArray JNICALL Java_com_netscape_symkey_SessionKey_Dive { newSlot = slot; } - if(strcmp( oldMasterKeyNameChars, "#01#01") == 0) + if(strcmp( oldMasterKeyNameChars, "#01#01") == 0 || strcmp( oldMasterKeyNameChars, "#FF#01") == 0) { old_kek_key_buff = Buffer((BYTE*)old_kek_key, 16); }else if(strcmp( oldMasterKeyNameChars, "#00#00") == 0) diff --git a/pki/base/tps/src/channel/Secure_Channel.cpp b/pki/base/tps/src/channel/Secure_Channel.cpp index cbc0d8527..58868db14 100644 --- a/pki/base/tps/src/channel/Secure_Channel.cpp +++ b/pki/base/tps/src/channel/Secure_Channel.cpp @@ -1150,6 +1150,12 @@ int Secure_Channel::PutKeys(RA_Session *session, BYTE key_version, RA::Debug(LL_PER_CONNECTION, FN, "RA_Processor::PutKey"); + //For certain keys that require the implicit keyset + //00 00 + // + if(key_version == 0xFF) + key_version = 0; + put_key_apdu = new Put_Key_APDU(key_version, 0x80 | key_index, *key_data); rc = ComputeAPDU(put_key_apdu); diff --git a/pki/dogtag/symkey/symkey.spec b/pki/dogtag/symkey/symkey.spec index f355bd6c7..d918198a3 100644 --- a/pki/dogtag/symkey/symkey.spec +++ b/pki/dogtag/symkey/symkey.spec @@ -27,7 +27,7 @@ ## Package Header Definitions %define base_name %{base_component} %define base_version 1.0.0 -%define base_release 7 +%define base_release 8 %define base_group System Environment/Libraries %define base_vendor Red Hat, Inc. %define base_license GPLv2 with exceptions @@ -239,6 +239,8 @@ rm -rf ${RPM_BUILD_ROOT} ############################################################################### %changelog +* Thu Mar 12 2009 Jack Magne <jmagne@redhat.com> 1.0.0-6 +- Bugilla Bug #48901 - Safenet 300J support key changeover. * Sat Feb 14 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-7 - Bugzilla Bug #250874 -Change spec file dependencies to rely on latest versions of components (NSPR, NSS, JSS, MOD_NSS) diff --git a/pki/dogtag/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec index 1814a0caa..ee5124843 100644 --- a/pki/dogtag/tps/pki-tps.spec +++ b/pki/dogtag/tps/pki-tps.spec @@ -34,7 +34,7 @@ ## Package Header Definitions %define base_name %{base_prefix}-%{base_component} %define base_version 1.0.0 -%define base_release 36 +%define base_release 37 %define base_group System Environment/Daemons %define base_vendor Red Hat, Inc. %define base_license LGPLv2 with exceptions @@ -312,6 +312,8 @@ fi ############################################################################### %changelog +* Thu Mar 12 2009 Jack Magne <jmagne@redhat.com> 1.0.0-37 +- Bugilla Bug #48901 - Safenet 300J support key changeover. * Wed Mar 11 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-36 - Bugzilla Bug #488338 - start/stop scripts should list all the available port numbers with their functionality |