Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated CodeIgniter to latest dev from Github

Browse Source
This commit is contained in:
Andreas
2021-11-06 20:05:55 +01:00
parent f0b97c148a
commit 016cd7198c
190 changed files with 2444 additions and 2402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
system/libraries/Encryption.php
View File

@@ -6,7 +6,7 @@
*
* This content is released under the MIT License (MIT)
*
* Copyright (c) 2014 - 2017, British Columbia Institute of Technology
* Copyright (c) 2014 - 2019, British Columbia Institute of Technology
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -29,8 +29,8 @@
* @package CodeIgniter
* @author EllisLab Dev Team
* @copyright Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
* @copyright Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
* @license http://opensource.org/licenses/MIT MIT License
* @copyright Copyright (c) 2014 - 2019, British Columbia Institute of Technology (https://bcit.ca/)
* @license https://opensource.org/licenses/MIT MIT License
* @link https://codeigniter.com
* @since Version 3.0.0
* @filesource
@@ -46,7 +46,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
* @subpackage Libraries
* @category Libraries
* @author Andrey Andreev
* @link https://codeigniter.com/user_guide/libraries/encryption.html
* @link https://codeigniter.com/userguide3/libraries/encryption.html
*/
class CI_Encryption {
@@ -482,7 +482,7 @@ class CI_Encryption {
$data,
$params['handle'],
$params['key'],
1, // DO NOT TOUCH!
OPENSSL_RAW_DATA,
$iv
);
@@ -641,7 +641,7 @@ class CI_Encryption {
$data,
$params['handle'],
$params['key'],
1, // DO NOT TOUCH!
OPENSSL_RAW_DATA,
$iv
);
}
@@ -682,10 +682,8 @@ class CI_Encryption {
{
return FALSE;
}
else
{
$params['mode'] = $this->_modes[$this->_driver][$params['mode']];
}
$params['mode'] = $this->_modes[$this->_driver][$params['mode']];
}
if (isset($params['hmac']) && $params['hmac'] === FALSE)
@@ -930,9 +928,6 @@ class CI_Encryption {
{
if (self::$func_overload)
{
// mb_substr($str, $start, null, '8bit') returns an empty
// string on PHP 5.3
isset($length) OR $length = ($start >= 0 ? self::strlen($str) - $start : -$start);
return mb_substr($str, $start, $length, '8bit');
}