diff --git a/core/pom.xml b/core/pom.xml index 9e94014..753cd05 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -19,13 +19,13 @@ org.springframework spring-context - 3.0.5.RELEASE + 5.3.19 commons-configuration commons-configuration - 1.5 + 1.10 @@ -33,29 +33,35 @@ commons-chain 1.2 - + + + commons-digester + commons-digester + 2.1 + + commons-pool commons-pool - 1.5.4 + 1.6 net.sf.ehcache ehcache-core - 2.4.0 + 2.6.11 org.slf4j slf4j-log4j12 - 1.5.8 + 1.7.36 log4j log4j - 1.2.15 + 1.2.17 javax.jms diff --git a/core/src/main/java/net/jradius/server/config/XMLConfiguration.java b/core/src/main/java/net/jradius/server/config/XMLConfiguration.java index 4b29eba..f5e1064 100644 --- a/core/src/main/java/net/jradius/server/config/XMLConfiguration.java +++ b/core/src/main/java/net/jradius/server/config/XMLConfiguration.java @@ -23,13 +23,12 @@ import java.io.Reader; import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.HierarchicalXMLConfiguration; /** * JRadius XML Configuration Parser. * @author David Bird */ -public class XMLConfiguration extends HierarchicalXMLConfiguration +public class XMLConfiguration extends org.apache.commons.configuration.XMLConfiguration { XMLConfiguration(Reader reader) throws ConfigurationException { diff --git a/extended/pom.xml b/extended/pom.xml index 2eed19c..3ebe70f 100644 --- a/extended/pom.xml +++ b/extended/pom.xml @@ -31,7 +31,7 @@ org.bouncycastle bcprov-jdk15on - 1.56 + 1.70 diff --git a/extended/src/main/java/net/jradius/client/auth/EAPTLSAuthenticator.java b/extended/src/main/java/net/jradius/client/auth/EAPTLSAuthenticator.java index 42e0b9b..7ad51e0 100644 --- a/extended/src/main/java/net/jradius/client/auth/EAPTLSAuthenticator.java +++ b/extended/src/main/java/net/jradius/client/auth/EAPTLSAuthenticator.java @@ -60,6 +60,7 @@ import org.bouncycastle.asn1.pkcs.DHParameter; import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers; import org.bouncycastle.asn1.pkcs.PrivateKeyInfo; +import org.bouncycastle.asn1.pkcs.RSAPrivateKey; import org.bouncycastle.asn1.pkcs.RSAPrivateKeyStructure; import org.bouncycastle.asn1.sec.ECPrivateKey; import org.bouncycastle.asn1.sec.SECNamedCurves; @@ -595,8 +596,7 @@ public static AsymmetricKeyParameter createKey( AlgorithmIdentifier algId = keyInfo.getPrivateKeyAlgorithm(); if (algId.getAlgorithm().equals(PKCSObjectIdentifiers.rsaEncryption)) { - RSAPrivateKeyStructure keyStructure = new RSAPrivateKeyStructure((ASN1Sequence)keyInfo.getPrivateKey()); - + RSAPrivateKey keyStructure=RSAPrivateKey.getInstance(keyInfo.parsePrivateKey()); return new RSAPrivateCrtKeyParameters( keyStructure.getModulus(), keyStructure.getPublicExponent(), diff --git a/server/pom.xml b/server/pom.xml index 1c47ffd..f30cda9 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -43,7 +43,7 @@ org.springframework spring-context-support - 3.0.5.RELEASE + 5.3.19