diff options
| author | Quinn Chrzan <quinnchrzan@gmail.com> | 2014-05-30 19:25:12 +0200 |
|---|---|---|
| committer | Quinn Chrzan <quinnchrzan@gmail.com> | 2014-05-30 19:25:12 +0200 |
| commit | c77e1933e64e9e93d6318752deb668d96efeb62f (patch) | |
| tree | db3074ea63d6701c88bc5519b6a12d60f49bd439 /user_guide/libraries | |
| parent | 5800de6835bfa943b7ffca94917f3f85696cc35f (diff) | |
| parent | 9eb99bce5e1a62c5df8758eaf82f6edee61c35b1 (diff) | |
Merge pull request #3071 from EllisLab/bug/xor_encode
Bug/xor encode
Diffstat (limited to 'user_guide/libraries')
| -rw-r--r-- | user_guide/libraries/encryption.html | 9 | ||||
| -rw-r--r-- | user_guide/libraries/sessions.html | 4 |
2 files changed, 6 insertions, 7 deletions
diff --git a/user_guide/libraries/encryption.html b/user_guide/libraries/encryption.html index cd59a6c30..4331372a3 100644 --- a/user_guide/libraries/encryption.html +++ b/user_guide/libraries/encryption.html @@ -58,11 +58,8 @@ Encryption Class <h1>Encryption Class</h1> -<p>The Encryption Class provides two-way data encryption. It uses a scheme that either compiles -the message using a randomly hashed bitwise XOR encoding scheme, or is encrypted using -the Mcrypt library. If Mcrypt is not available on your server the encoded message will -still provide a reasonable degree of security for encrypted sessions or other such "light" purposes. -If Mcrypt is available, you'll be provided with a high degree of security appropriate for storage.</p> +<p>The Encryption Class provides two-way data encryption. It is encrypted using +the Mcrypt library. The Encryption Class requires the Mcrypt extension to run.</p> <h2>Setting your Key</h2> @@ -221,4 +218,4 @@ Next Topic: <a href="file_uploading.html">File Uploading Class</a> </div> </body> -</html>
\ No newline at end of file +</html> diff --git a/user_guide/libraries/sessions.html b/user_guide/libraries/sessions.html index 1b7b73ab9..989170a45 100644 --- a/user_guide/libraries/sessions.html +++ b/user_guide/libraries/sessions.html @@ -71,6 +71,8 @@ generates its own session data, offering more flexibility for developers.</p> <p class="important"><strong>Note:</strong> Even if you are not using encrypted sessions, you must set an <a href="./encryption.html">encryption key</a> in your config file which is used to aid in preventing session data manipulation.</p> +<p class="important"><strong>Note:</strong> The Session class relies on the Encryption class, so you must have Mcrypt extension installed</p> + <h2>Initializing a Session</h2> <p>Sessions will typically run globally with each page load, so the session class must either be @@ -338,4 +340,4 @@ Next Topic: <a href="trackback.html">Trackback Class</a> </div> </body> -</html>
\ No newline at end of file +</html> |