[Engine-patches] Change in ovirt-engine[engine_3.2]: compat: convert to base64 without line feed

[Alon Bar-Lev]

Alon Bar-Lev has uploaded a new change for review.

Change subject: compat: convert to base64 without line feed
......................................................................

compat: convert to base64 without line feed

This is regression of change Ie7a540d9c69, as the ticketing base64
conversion should not contain line feed.

Change-Id: I33790b47ede99eade178b488a66cd8cc280cb872
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M 
backend/manager/modules/engineencryptutils/src/main/java/org/ovirt/engine/core/engineencryptutils/EncryptionUtils.java
M 
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/Ticketing.java
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/11611/1

diff --git 
a/backend/manager/modules/engineencryptutils/src/main/java/org/ovirt/engine/core/engineencryptutils/EncryptionUtils.java
 
b/backend/manager/modules/engineencryptutils/src/main/java/org/ovirt/engine/core/engineencryptutils/EncryptionUtils.java
index 1255834..5d12248 100644
--- 
a/backend/manager/modules/engineencryptutils/src/main/java/org/ovirt/engine/core/engineencryptutils/EncryptionUtils.java
+++ 
b/backend/manager/modules/engineencryptutils/src/main/java/org/ovirt/engine/core/engineencryptutils/EncryptionUtils.java
@@ -40,7 +40,7 @@
     private static String encrypt(String source, Certificate cert) throws 
GeneralSecurityException, UnsupportedEncodingException {
         Cipher rsa = Cipher.getInstance(algo);
         rsa.init(Cipher.ENCRYPT_MODE, cert.getPublicKey());
-        return Base64.encodeBase64String(
+        return new Base64(0).encodeToString(
             rsa.doFinal(source.trim().getBytes("UTF-8"))
         );
     }
diff --git 
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/Ticketing.java
 
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/Ticketing.java
index d9a1ca2..1e36b89 100644
--- 
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/Ticketing.java
+++ 
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/Ticketing.java
@@ -10,6 +10,6 @@
         byte[] arrRandom = new byte[9];
         secr.nextBytes(arrRandom);
         // encode password into Base64 text:
-        return Base64.encodeBase64String(arrRandom);
+        return new Base64(0).encodeToString(arrRandom);
     }
 }


--
To view, visit http://gerrit.ovirt.org/11611
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33790b47ede99eade178b488a66cd8cc280cb872
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: engine_3.2
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches