[java-opensaml COMMIT] /trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Util.java

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Apr  3 00:45:38 2012
New Revision: 3021

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3021&view=rev
Log:
Get rid of IPAddressSupport class in favor of Google library class.

Modified:
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Util.java

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Util.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Util.java?rev=3021&r1=3020&r2=3021&view=diff
==============================================================================
--- trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Util.java (original)
+++ trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Util.java Tue Apr  3 00:45:38 2012
@@ -20,6 +20,8 @@
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.security.GeneralSecurityException;
 import java.security.PrivateKey;
 import java.security.cert.CRLException;
@@ -34,7 +36,6 @@
 
 import javax.security.auth.x500.X500Principal;
 
-import net.shibboleth.utilities.java.support.net.IPAddressSupport;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 
 import org.apache.commons.ssl.TrustMaterial;
@@ -54,6 +55,9 @@
 
 import com.google.common.base.Strings;
 import com.google.common.io.Files;
+import com.google.common.net.InetAddresses;
+
+import edu.vt.middleware.crypt.util.HexConverter;
 
 /**
  * Utility class for working with X509 objects.
@@ -432,7 +436,15 @@
 
         if (IP_ADDRESS_ALT_NAME.equals(nameType)) {
             // this is a byte[], IP addr in network byte order
-            return IPAddressSupport.addressToString((byte[]) nameValue);
+            byte [] nameValueBytes = (byte[]) nameValue;
+            try {
+                return InetAddresses.toAddrString(InetAddress.getByAddress(nameValueBytes));
+            } catch (UnknownHostException e) {
+                HexConverter hexConverter = new HexConverter(true);
+                log.warn("Was unable to convert IP address alt name byte[] to string: " +
+                        hexConverter.fromBytes(nameValueBytes), e);
+                return null;
+            }
         }
 
         if (EDI_PARTY_ALT_NAME.equals(nameType) || X400ADDRESS_ALT_NAME.equals(nameType)