vier: fix missing icons

[friendica.git] / include / crypto.php

diff --git a/include/crypto.php b/include/crypto.php
index 1ab9e7b25f79ac246346ac2de618388785fd072e..f5163a9dacbeb2bb8ccf8b3be23ff6de27a62546 100644 (file)
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -3,19 +3,20 @@
 require_once('library/ASNValue.class.php');
 require_once('library/asn1.php');
 
+// supported algorithms are 'sha256', 'sha1'
 
-function rsa_sign($data,$key) {
+function rsa_sign($data,$key,$alg = 'sha256') {
 
        $sig = '';
-       if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-               openssl_sign($data,$sig,$key,'sha256');
+       if (version_compare(PHP_VERSION, '5.3.0', '>=') || $alg === 'sha1') {
+               openssl_sign($data,$sig,$key,(($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg));
     }
     else {
                if(strlen($key) < 1024 || extension_loaded('gmp')) {
                        require_once('library/phpsec/Crypt/RSA.php');
                        $rsa = new CRYPT_RSA();
                        $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
-                       $rsa->setHash('sha256');
+                       $rsa->setHash($alg);
                        $rsa->loadKey($key);
                        $sig = $rsa->sign($data);
                }
@@ -27,17 +28,17 @@ function rsa_sign($data,$key) {
        return $sig;
 }
 
-function rsa_verify($data,$sig,$key) {
+function rsa_verify($data,$sig,$key,$alg = 'sha256') {
 
-       if (version_compare(PHP_VERSION, '5.3.0', '>=')) {
-               $verify = openssl_verify($data,$sig,$key,'sha256');
+       if (version_compare(PHP_VERSION, '5.3.0', '>=') || $alg === 'sha1') {
+               $verify = openssl_verify($data,$sig,$key,(($alg == 'sha1') ? OPENSSL_ALGO_SHA1 : $alg));
     }
     else {
                if(strlen($key) <= 300 || extension_loaded('gmp')) {
                        require_once('library/phpsec/Crypt/RSA.php');
                        $rsa = new CRYPT_RSA();
                        $rsa->signatureMode = CRYPT_RSA_SIGNATURE_PKCS1;
-                       $rsa->setHash('sha256');
+                       $rsa->setHash($alg);
                        $rsa->loadKey($key);
                        $verify = $rsa->verify($data,$sig);
                }
@@ -74,7 +75,7 @@ function DerToRsa($Der)
     //Encode:
     $Der = base64_encode($Der);
     //Split lines:
-    $lines = str_split($Der, 65);
+    $lines = str_split($Der, 64);
     $body = implode("\n", $lines);
     //Get title:
     $title = 'RSA PUBLIC KEY';
@@ -182,3 +183,81 @@ function salmon_key($pubkey) {
        pemtome($pubkey,$m,$e);
        return 'RSA' . '.' . base64url_encode($m,true) . '.' . base64url_encode($e,true) ;
 }
+
+
+
+if(! function_exists('aes_decrypt')) {
+// DEPRECATED IN 3.4.1
+function aes_decrypt($val,$ky)
+{
+    $key="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+    for($a=0;$a<strlen($ky);$a++)
+      $key[$a%16]=chr(ord($key[$a%16]) ^ ord($ky[$a]));
+    $mode = MCRYPT_MODE_ECB;
+    $enc = MCRYPT_RIJNDAEL_128;
+    $dec = @mcrypt_decrypt($enc, $key, $val, $mode, @mcrypt_create_iv( @mcrypt_get_iv_size($enc, $mode), MCRYPT_DEV_URANDOM ) );
+    return rtrim($dec,(( ord(substr($dec,strlen($dec)-1,1))>=0 and ord(substr($dec, strlen($dec)-1,1))<=16)? chr(ord( substr($dec,strlen($dec)-1,1))):null));
+}}
+
+
+if(! function_exists('aes_encrypt')) {
+// DEPRECATED IN 3.4.1
+function aes_encrypt($val,$ky)
+{
+    $key="\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+    for($a=0;$a<strlen($ky);$a++)
+      $key[$a%16]=chr(ord($key[$a%16]) ^ ord($ky[$a]));
+    $mode=MCRYPT_MODE_ECB;
+    $enc=MCRYPT_RIJNDAEL_128;
+    $val=str_pad($val, (16*(floor(strlen($val) / 16)+(strlen($val) % 16==0?2:1))), chr(16-(strlen($val) % 16)));
+    return mcrypt_encrypt($enc, $key, $val, $mode, mcrypt_create_iv( mcrypt_get_iv_size($enc, $mode), MCRYPT_DEV_URANDOM));
+}} 
+
+function pkcs5_pad ($text, $blocksize)
+{
+    $pad = $blocksize - (strlen($text) % $blocksize);
+    return $text . str_repeat(chr($pad), $pad);
+}
+
+function pkcs5_unpad($text)
+{
+    $pad = ord($text{strlen($text)-1});
+    if ($pad > strlen($text)) return false;
+    if (strspn($text, chr($pad), strlen($text) - $pad) != $pad) return false;
+    return substr($text, 0, -1 * $pad);
+} 
+
+
+function new_keypair($bits) {
+
+       $openssl_options = array(
+               'digest_alg'       => 'sha1',
+               'private_key_bits' => $bits,
+               'encrypt_key'      => false 
+       );
+
+       $conf = get_config('system','openssl_conf_file');
+       if($conf)
+               $openssl_options['config'] = $conf;
+       
+       $result = openssl_pkey_new($openssl_options);
+
+       if(empty($result)) {
+               logger('new_keypair: failed');
+               return false;
+       }
+
+       // Get private key
+
+       $response = array('prvkey' => '', 'pubkey' => '');
+
+       openssl_pkey_export($result, $response['prvkey']);
+
+       // Get public key
+       $pkey = openssl_pkey_get_details($result);
+       $response['pubkey'] = $pkey["key"];
+
+       return $response;
+
+}
+