diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-02-21 22:22:16 -0600 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-02-23 21:15:27 -0600 |
| commit | ed31fc445fc6d4769b7bd119770ae1da9b15d2bf (patch) | |
| tree | 6d01d561bba4d2c505c22355522d8b30041f747a /pki/base/util/src | |
| parent | 970e3667eede41e72bb5a4cadf1d056ff526d944 (diff) | |
| download | pki-ed31fc445fc6d4769b7bd119770ae1da9b15d2bf.tar.gz pki-ed31fc445fc6d4769b7bd119770ae1da9b15d2bf.tar.xz pki-ed31fc445fc6d4769b7bd119770ae1da9b15d2bf.zip | |
Replaced BtoA/AtoB with Apache codec.
The OSUtil's BtoA() and AtoB() have been replaced by Base64
codec from Apache Commons library. The codec is configured to
use 64-byte line width as defined in RFC 1421.
Ticket #90
Diffstat (limited to 'pki/base/util/src')
| -rw-r--r-- | pki/base/util/src/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | pki/base/util/src/com/netscape/cmsutil/util/Utils.java | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/pki/base/util/src/CMakeLists.txt b/pki/base/util/src/CMakeLists.txt index 919b593e7..0c78ac3b7 100644 --- a/pki/base/util/src/CMakeLists.txt +++ b/pki/base/util/src/CMakeLists.txt @@ -24,6 +24,13 @@ find_file(OSUTIL_JAR /usr/share/java ) +find_file(COMMONS_CODEC_JAR + NAMES + commons-codec.jar + PATHS + /usr/share/java +) + find_file(XALAN_JAR NAMES xalan-j2.jar @@ -332,7 +339,7 @@ set(pki-cmsutil_java_SRCS set(CMAKE_JAVA_INCLUDE_PATH ${LDAPJDK_JAR} ${XALAN_JAR} ${XERCES_JAR} - ${JSS_JAR} ${OSUTIL_JAR}) + ${JSS_JAR} ${OSUTIL_JAR} ${COMMONS_CODEC_JAR}) set(CMAKE_JAVA_TARGET_VERSION ${APPLICATION_VERSION}) diff --git a/pki/base/util/src/com/netscape/cmsutil/util/Utils.java b/pki/base/util/src/com/netscape/cmsutil/util/Utils.java index a1801785c..303566416 100644 --- a/pki/base/util/src/com/netscape/cmsutil/util/Utils.java +++ b/pki/base/util/src/com/netscape/cmsutil/util/Utils.java @@ -17,6 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.cmsutil.util; +import org.apache.commons.codec.binary.Base64; + import java.io.BufferedReader; import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; @@ -263,12 +265,12 @@ public class Utils { } public static String base64encode(byte[] bytes) { - String string = com.netscape.osutil.OSUtil.BtoA(bytes); + String string = new Base64(64).encodeToString(bytes); return string; } public static byte[] base64decode(String string) { - byte[] bytes = com.netscape.osutil.OSUtil.AtoB(string); + byte[] bytes = Base64.decodeBase64(string); return bytes; } } |