diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 7763f6bea56143ed904fa08bf24bcd5c4c9c1da2..e5bc3adcbc517e4dfb1de451f1a69637b07f3a2b 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -55,20 +55,14 @@ class Crypt {
* @returns encrypted file
*/
public static function encrypt( $plainContent, $iv, $passphrase = '' ) {
-
- # TODO: Move these methods into a separate public class for app developers
-
- $iv64 = base64_encode( $iv );
-
- $raw = false; // true returns raw bytes, false returns base64
- if ( $encryptedContent = openssl_encrypt( $plainContent, 'AES-256-OFB', $passphrase, $raw, $iv ) ) {
+ if ( $encryptedContent = openssl_encrypt( $plainContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
return $encryptedContent;
} else {
- \OC_Log::write( 'Encrypted storage', 'Encryption (symmetric) of file failed' , \OC_Log::ERROR );
+ \OC_Log::write( 'Encrypted storage', 'Encryption (symmetric) of content failed' , \OC_Log::ERROR );
return false;
@@ -81,21 +75,15 @@ class Crypt {
* @returns decrypted file
*/
public static function decrypt( $encryptedContent, $iv, $passphrase ) {
-
-// $iv64 = base64_encode( $iv );
-//
-// $iv = base64_decode( $iv64 );
-
- $raw = false; // true returns raw bytes, false returns base64
- if ( $plainContent = openssl_decrypt( $encryptedContent, 'AES-256-OFB', $passphrase, $raw, $iv) ) {
+ if ( $plainContent = openssl_decrypt( $encryptedContent, 'AES-128-CFB', $passphrase, false, $iv ) ) {
return $plainContent;
} else {
- \OC_Log::write( 'Encrypted storage', 'Decryption (symmetric) of file failed' , \OC_Log::ERROR );
+ \OC_Log::write( 'Encrypted storage', 'Decryption (symmetric) of content failed' , \OC_Log::ERROR );
return false;
@@ -104,113 +92,97 @@ class Crypt {
}
/**
- * @brief Asymetrically encrypt a file using a public key
- * @returns encrypted file
+ * @brief Creates symmetric keyfile content
+ * @param $plainContent content to be encrypted in keyfile
+ * @returns encrypted content combined with IV
+ * @note IV need not be specified, as it will be stored in the returned keyfile
+ * and remain accessible therein.
*/
- public static function keyEncrypt( $plainContent, $publicKey ) {
-
- openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );
+ public static function symmetricEncryptFileContent( $plainContent, $passphrase = '' ) {
- return $encryptedContent;
-
- }
-
- /**
- * @brief Asymetrically decrypt a file using a private key
- * @returns decrypted file
- */
- public static function keyDecrypt( $encryptedContent, $privatekey ) {
+ if ( !$plainContent ) {
+
+ return false;
+
+ }
+
+ $random = openssl_random_pseudo_bytes( 13 );
- openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );
+ $iv = substr( base64_encode( $random ), 0, -4 );
- return $plainContent;
-
- }
-
- public static function encryptFile( $source, $target, $key='') {
- $handleread = fopen($source, "rb");
- if($handleread!=FALSE) {
- $handlewrite = fopen($target, "wb");
- while (!feof($handleread)) {
- $content = fread($handleread, 8192);
- $enccontent=OC_CRYPT::encrypt( $content, $key);
- fwrite($handlewrite, $enccontent);
- }
- fclose($handlewrite);
- fclose($handleread);
+ if ( $encryptedContent = self::encrypt( $plainContent, $iv, $passphrase ) ) {
+
+ $combinedKeyfile = $encryptedContent .= $iv;
+
+ return $combinedKeyfile;
+
+ } else {
+
+ \OC_Log::write( 'Encrypted storage', 'Encryption (symmetric) of keyfile content failed' , \OC_Log::ERROR );
+
+ return false;
+
}
+
}
/**
- * @brief decryption of a file
+ * @brief Decrypts keyfile content
* @param string $source
* @param string $target
* @param string $key the decryption key
*
* This function decrypts a file
*/
- public static function decryptFile( $source, $target, $key='') {
- $handleread = fopen($source, "rb");
- if($handleread!=FALSE) {
- $handlewrite = fopen($target, "wb");
- while (!feof($handleread)) {
- $content = fread($handleread, 8192);
- $enccontent=OC_CRYPT::decrypt( $content, $key);
- if(feof($handleread)){
- $enccontent=rtrim($enccontent, "\0");
- }
- fwrite($handlewrite, $enccontent);
- }
- fclose($handlewrite);
- fclose($handleread);
- }
- }
+ public static function symmetricDecryptFileContent( $keyfileContent, $passphrase = '' ) {
- /**
- * @brief Encrypts data in 8192 byte sized blocks
- * @returns encrypted data
- */
- public static function blockEncrypt( $data, $key = '' ){
-
- $result = '';
-
- while( strlen( $data ) ) {
+ if ( !$keyfileContent ) {
- // Encrypt byte block
- $result .= self::encrypt( substr( $data, 0, 8192 ), $key );
+ return false;
- $data = substr( $data, 8192 );
-
}
- return $result;
- }
-
- /**
- * decrypt data in 8192b sized blocks
- */
- public static function blockDecrypt( $data, $key='', $maxLength = 0 ) {
-
- $result = '';
+ $iv = substr( $keyfileContent, -16 );
- while( strlen( $data ) ) {
-
- $result .= self::decrypt( substr( $data, 0, 8192 ), $key );
-
- $data = substr( $data,8192 );
-
- }
+ $encryptedContent = substr( $keyfileContent, 0, -16 );
- if ( $maxLength > 0 ) {
+ if ( $plainContent = self::decrypt( $encryptedContent, $iv, $passphrase ) ) {
- return substr( $result, 0, $maxLength );
+ return $plainContent;
} else {
- return rtrim( $result, "\0" );
+ \OC_Log::write( 'Encrypted storage', 'Decryption (symmetric) of keyfile content failed' , \OC_Log::ERROR );
+
+ return false;
}
+
+ }
+
+ /**
+ * @brief Asymetrically encrypt a file using a public key
+ * @returns encrypted file
+ */
+ public static function keyEncrypt( $plainContent, $publicKey ) {
+
+ openssl_public_encrypt( $plainContent, $encryptedContent, $publicKey );
+
+ return $encryptedContent;
+
+ }
+
+ /**
+ * @brief Asymetrically decrypt a file using a private key
+ * @returns decrypted file
+ */
+ public static function keyDecrypt( $encryptedContent, $privatekey ) {
+
+ openssl_private_decrypt( $encryptedContent, $plainContent, $privatekey );
+
+ return $plainContent;
+
}
/**
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index d576b7529440fe32ca5838d11ef7d43ed87a8207..9c0f71fe395a1f803c734bfc01ae796a3d6f701b 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -114,7 +114,7 @@ class Util {
# TODO: Use proper IV in encryption
// Encrypt private key with user pwd as passphrase
- $encryptedPrivateKey = Crypt::encrypt( $keypair['privateKey'], 1234567890123456, $passphrase );
+ $encryptedPrivateKey = Crypt::createSymmetricKeyfile( $keypair['privateKey'], $passphrase );
// $iv = openssl_random_pseudo_bytes(16);
$this->view->file_put_contents( '/'. 'keypair'. '/' . $privateKeyFileName, $encryptedPrivateKey );