Attachment #23167 for bug #42061

View | Details | Raw Unified | Return to bug 42061
Collapse All | Expand All

Lines 690-693 Link Here

(-)src/org/apache/xml/security/utils/XMLUtils.java (+4 lines)
690	public static boolean ignoreLineBreaks() {	690	public static boolean ignoreLineBreaks() {
691	return ignoreLineBreaks;	691	return ignoreLineBreaks;
692	}	692	}
		693
		694	public static void setIgnoreLineBreaks(boolean setIgnoreLineBreaks) {
		695	ignoreLineBreaks = setIgnoreLineBreaks;
		696	}
693	}	697	}





		String jceKeyAlgorithm =
			JCEMapper.getJCEKeyAlgorithmFromURI(algorithm);
		logger.debug("JCE Key Algorithm: " + jceKeyAlgorithm);

		Cipher c;
		if (_contextCipher == null) {

			String jceAlgorithm =
				JCEMapper.translateURItoJCEID(
					encryptedKey.getEncryptionMethod().getAlgorithm());
		        System.out.println("jcekeyAlg:"+jceAlgorithm);

			logger.debug("JCE Algorithm = " + jceAlgorithm);



		String jceAlgorithm = 
			JCEMapper.translateURItoJCEID(encryptedData.getEncryptionMethod().getAlgorithm());
		logger.debug("JCE Algorithm = " + jceAlgorithm);

		Cipher c;
		try {

                    EncryptionConstants.EncryptionSpecNS, 
                    EncryptionConstants._TAG_OAEPPARAMS).item(0);
            if (null != oaepParamsElement) {
		System.out.println("OAEPParams");
                result.setOAEPparams(
                    oaepParamsElement.getNodeValue().getBytes());
            }

Return to bug 42061

Lines 1283-1289 Link Here

(-)src/org/apache/xml/security/encryption/XMLCipher.java (-4 / +2 lines)
1283		1283
1284	String jceKeyAlgorithm =	1284	String jceKeyAlgorithm =
1285	JCEMapper.getJCEKeyAlgorithmFromURI(algorithm);	1285	JCEMapper.getJCEKeyAlgorithmFromURI(algorithm);
1286	System.out.println("keyAlg:"+jceKeyAlgorithm);	1286	logger.debug("JCE Key Algorithm: " + jceKeyAlgorithm);
1287		1287
1288	Cipher c;	1288	Cipher c;
1289	if (_contextCipher == null) {	1289	if (_contextCipher == null) {
Lines 1292-1298 Link Here
1292	String jceAlgorithm =	1292	String jceAlgorithm =
1293	JCEMapper.translateURItoJCEID(	1293	JCEMapper.translateURItoJCEID(
1294	encryptedKey.getEncryptionMethod().getAlgorithm());	1294	encryptedKey.getEncryptionMethod().getAlgorithm());
1295	System.out.println("jcekeyAlg:"+jceAlgorithm);
1296		1295
1297	logger.debug("JCE Algorithm = " + jceAlgorithm);	1296	logger.debug("JCE Algorithm = " + jceAlgorithm);
1298		1297
Lines 1483-1489 Link Here
1483		1482
1484	String jceAlgorithm =	1483	String jceAlgorithm =
1485	JCEMapper.translateURItoJCEID(encryptedData.getEncryptionMethod().getAlgorithm());	1484	JCEMapper.translateURItoJCEID(encryptedData.getEncryptionMethod().getAlgorithm());
1486	System.out.println("alg:"+jceAlgorithm);	1485	logger.debug("JCE Algorithm = " + jceAlgorithm);
1487		1486
1488	Cipher c;	1487	Cipher c;
1489	try {	1488	try {
Lines 2480-2486 Link Here
2480	EncryptionConstants.EncryptionSpecNS,	2479	EncryptionConstants.EncryptionSpecNS,
2481	EncryptionConstants._TAG_OAEPPARAMS).item(0);	2480	EncryptionConstants._TAG_OAEPPARAMS).item(0);
2482	if (null != oaepParamsElement) {	2481	if (null != oaepParamsElement) {
2483	System.out.println("OAEPParams");
2484	result.setOAEPparams(	2482	result.setOAEPparams(
2485	oaepParamsElement.getNodeValue().getBytes());	2483	oaepParamsElement.getNodeValue().getBytes());
2486	}	2484	}