Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package jss Fixes a bug that had gone unnoticed until now. The patch refresh diff is unfortunate, but can't be avoided anymore.. diff -Nru jss-4.3.1/debian/changelog jss-4.3.1/debian/changelog --- jss-4.3.1/debian/changelog 2014-10-25 13:14:36.000000000 +0300 +++ jss-4.3.1/debian/changelog 2014-11-26 15:48:23.000000000 +0200 @@ -1,3 +1,9 @@ +jss (4.3.1-6) unstable; urgency=medium + + * jss-PBE-PKCS5-V2-secure-P12.patch: Bump NUM_ALGS. (Closes: #688472) + + -- Timo Aaltonen <tjaal...@debian.org> Wed, 26 Nov 2014 15:48:14 +0200 + jss (4.3.1-5) unstable; urgency=medium * control: Bump policy to 3.9.6. diff -Nru jss-4.3.1/debian/patches/jss-PBE-PKCS5-V2-secure-P12.patch jss-4.3.1/debian/patches/jss-PBE-PKCS5-V2-secure-P12.patch --- jss-4.3.1/debian/patches/jss-PBE-PKCS5-V2-secure-P12.patch 2014-10-16 14:10:06.000000000 +0300 +++ jss-4.3.1/debian/patches/jss-PBE-PKCS5-V2-secure-P12.patch 2014-11-03 11:23:24.000000000 +0200 @@ -1,8 +1,6 @@ -Index: jss/security/jss/org/mozilla/jss/crypto/Algorithm.c -=================================================================== ---- jss.orig/security/jss/org/mozilla/jss/crypto/Algorithm.c 2012-02-18 12:35:05.000000000 +0200 -+++ jss/security/jss/org/mozilla/jss/crypto/Algorithm.c 2012-02-18 12:40:31.899853750 +0200 -@@ -114,6 +114,9 @@ +--- a/security/jss/org/mozilla/jss/crypto/Algorithm.c ++++ b/security/jss/org/mozilla/jss/crypto/Algorithm.c +@@ -114,6 +114,9 @@ JSS_AlgInfo JSS_AlgTable[NUM_ALGS] = { /* 51 */ {SEC_OID_HMAC_SHA384, SEC_OID_TAG}, /* 52 */ {SEC_OID_HMAC_SHA512, SEC_OID_TAG}, /* 53 */ {SEC_OID_ANSIX962_ECDSA_SIGNATURE_SPECIFIED_DIGEST, SEC_OID_TAG}, @@ -12,11 +10,9 @@ /* REMEMBER TO UPDATE NUM_ALGS!!! */ }; -Index: jss/security/jss/org/mozilla/jss/crypto/Algorithm.java -=================================================================== ---- jss.orig/security/jss/org/mozilla/jss/crypto/Algorithm.java 2012-02-18 12:35:05.000000000 +0200 -+++ jss/security/jss/org/mozilla/jss/crypto/Algorithm.java 2012-02-18 12:42:14.002917182 +0200 -@@ -237,5 +237,8 @@ +--- a/security/jss/org/mozilla/jss/crypto/Algorithm.java ++++ b/security/jss/org/mozilla/jss/crypto/Algorithm.java +@@ -237,5 +237,8 @@ public class Algorithm { protected static final short SEC_OID_HMAC_SHA384=51; protected static final short SEC_OID_HMAC_SHA512=52; protected static final short SEC_OID_ANSIX962_ECDSA_SIGNATURE_SPECIFIED_DIGEST=53; @@ -25,11 +21,9 @@ + protected static final short SEC_OID_PKCS5_PBMAC1=56; } -Index: jss/security/jss/org/mozilla/jss/crypto/PBEAlgorithm.java -=================================================================== ---- jss.orig/security/jss/org/mozilla/jss/crypto/PBEAlgorithm.java 2011-10-05 00:41:22.000000000 +0300 -+++ jss/security/jss/org/mozilla/jss/crypto/PBEAlgorithm.java 2012-02-18 12:39:53.438699572 +0200 -@@ -93,6 +93,27 @@ +--- a/security/jss/org/mozilla/jss/crypto/PBEAlgorithm.java ++++ b/security/jss/org/mozilla/jss/crypto/PBEAlgorithm.java +@@ -93,6 +93,27 @@ public class PBEAlgorithm extends KeyGen /////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////// @@ -57,11 +51,9 @@ public static final PBEAlgorithm PBE_MD2_DES_CBC = new PBEAlgorithm( SEC_OID_PKCS5_PBE_WITH_MD2_AND_DES_CBC, "PBE/MD2/DES/CBC", 56, -Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c -=================================================================== ---- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c 2012-02-18 12:35:05.774087090 +0200 -+++ jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c 2012-02-18 12:39:53.438699572 +0200 -@@ -313,7 +313,6 @@ +--- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c ++++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyGenerator.c +@@ -313,7 +313,6 @@ Java_org_mozilla_jss_pkcs11_PK11KeyGener } /* print_secitem(pwitem); */ @@ -69,7 +61,7 @@ mech = JSS_getPK11MechFromAlg(env, alg); if( mech == CKM_PBA_SHA1_WITH_SHA1_HMAC ) { -@@ -333,7 +332,14 @@ +@@ -333,7 +332,14 @@ Java_org_mozilla_jss_pkcs11_PK11KeyGener PR_ASSERT(oidTag != SEC_OID_UNKNOWN); /* create algid */ @@ -85,11 +77,9 @@ if( algid == NULL ) { JSS_throwMsg(env, TOKEN_EXCEPTION, "Unable to process PBE parameters"); -Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c -=================================================================== ---- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c 2012-02-18 12:35:05.000000000 +0200 -+++ jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c 2012-02-18 12:39:53.438699572 +0200 -@@ -324,14 +324,34 @@ +--- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c ++++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c +@@ -324,14 +324,34 @@ Java_org_mozilla_jss_pkcs11_PK11KeyWrapp SECItem *wrapped=NULL, *iv=NULL, *param=NULL, *pubValue=NULL; SECItem label; /* empty secitem, doesn't need to be freed */ PRBool token; @@ -126,7 +116,7 @@ /* get unwrapping key */ if( JSS_PK11_getSymKeyPtr(env, unwrapperObj, &unwrappingKey) != PR_SUCCESS) { -@@ -392,14 +412,24 @@ +@@ -392,14 +412,24 @@ Java_org_mozilla_jss_pkcs11_PK11KeyWrapp } keyType = PK11_GetKeyType(keyTypeMech, 0); @@ -155,7 +145,7 @@ break; case CKK_DSA: attribs[0] = CKA_SIGN; -@@ -426,7 +456,7 @@ +@@ -426,7 +456,7 @@ Java_org_mozilla_jss_pkcs11_PK11KeyWrapp /* perform the unwrap */ privk = PK11_UnwrapPrivKey(slot, unwrappingKey, wrapType, param, wrapped, @@ -164,11 +154,9 @@ attribs, numAttribs, NULL /*wincx*/); if( privk == NULL ) { JSS_throwMsg(env, TOKEN_EXCEPTION, "Key Unwrap failed on token"); -Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java -=================================================================== ---- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java 2011-10-05 00:41:22.000000000 +0300 -+++ jss/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java 2012-02-18 12:39:53.438699572 +0200 -@@ -190,21 +190,23 @@ +--- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java ++++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.java +@@ -190,21 +190,23 @@ final class PK11KeyWrapper implements Ke if( key==null ) { throw new InvalidKeyException("Key is null"); } @@ -201,11 +189,9 @@ } } -Index: jss/security/jss/org/mozilla/jss/pkcs11/PK11Token.java -=================================================================== ---- jss.orig/security/jss/org/mozilla/jss/pkcs11/PK11Token.java 2012-02-18 12:35:05.000000000 +0200 -+++ jss/security/jss/org/mozilla/jss/pkcs11/PK11Token.java 2012-02-18 12:39:53.438699572 +0200 -@@ -106,10 +106,13 @@ +--- a/security/jss/org/mozilla/jss/pkcs11/PK11Token.java ++++ b/security/jss/org/mozilla/jss/pkcs11/PK11Token.java +@@ -106,10 +106,13 @@ public final class PK11Token implements getKeyGenerator(KeyGenAlgorithm algorithm) throws NoSuchAlgorithmException, TokenException { @@ -219,11 +205,9 @@ return new PK11KeyGenerator(this, algorithm); } -Index: jss/security/jss/org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java -=================================================================== ---- jss.orig/security/jss/org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java 2011-10-05 00:41:22.000000000 +0300 -+++ jss/security/jss/org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java 2012-02-18 12:39:53.438699572 +0200 -@@ -43,6 +43,7 @@ +--- a/security/jss/org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java ++++ b/security/jss/org/mozilla/jss/pkix/primitive/EncryptedPrivateKeyInfo.java +@@ -43,6 +43,7 @@ import org.mozilla.jss.util.Assert; import java.security.*; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.util.Password; @@ -231,7 +215,7 @@ import java.security.spec.AlgorithmParameterSpec; /** -@@ -184,6 +185,89 @@ +@@ -184,6 +185,89 @@ public class EncryptedPrivateKeyInfo imp return null; } @@ -321,3 +305,14 @@ /** * Decrypts an EncryptedPrivateKeyInfo that was encrypted with a PBE * algorithm. The algorithm and its parameters are extracted from +--- a/security/jss/org/mozilla/jss/crypto/Algorithm.h ++++ b/security/jss/org/mozilla/jss/crypto/Algorithm.h +@@ -56,7 +56,7 @@ typedef struct JSS_AlgInfoStr { + JSS_AlgType type; + } JSS_AlgInfo; + +-#define NUM_ALGS 54 ++#define NUM_ALGS 57 + + extern JSS_AlgInfo JSS_AlgTable[]; + extern CK_ULONG JSS_symkeyUsage[]; unblock jss/4.3.1-6 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org