<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[49056] trunk/src/wp-includes/sodium_compat: Upgrade/Install: Update sodium_compat to v1.13.0.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/49056">49056</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/49056","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-09-27 04:44:01 +0000 (Sun, 27 Sep 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Upgrade/Install: Update sodium_compat to v1.13.0.
This includes a few autoloader fixes and improvements.
A full list of changes in this update can be found on GitHub:
https://github.com/paragonie/sodium_compat/compare/v1.12.1...v1.13.0
See <a href="https://core.trac.wordpress.org/ticket/51399">#51399</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludessodium_compatautoloadphp">trunk/src/wp-includes/sodium_compat/autoload.php</a></li>
<li><a href="#trunksrcwpincludessodium_compatlibphp72compatphp">trunk/src/wp-includes/sodium_compat/lib/php72compat.php</a></li>
<li><a href="#trunksrcwpincludessodium_compatsrcCompatphp">trunk/src/wp-includes/sodium_compat/src/Compat.php</a></li>
<li><a href="#trunksrcwpincludessodium_compatsrcFilephp">trunk/src/wp-includes/sodium_compat/src/File.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunksrcwpincludessodium_compatautoloadphp7php">trunk/src/wp-includes/sodium_compat/autoload-php7.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludessodium_compatautoloadphp7php"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: trunk/src/wp-includes/sodium_compat/autoload-php7.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sodium_compat/autoload-php7.php (rev 0)
+++ trunk/src/wp-includes/sodium_compat/autoload-php7.php 2020-09-27 04:44:01 UTC (rev 49056)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,31 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/*
+ This file should only ever be loaded on PHP 7+
+ */
+if (PHP_VERSION_ID < 70000) {
+ return;
+}
+
+spl_autoload_register(function ($class) {
+ $namespace = 'ParagonIE_Sodium_';
+ // Does the class use the namespace prefix?
+ $len = strlen($namespace);
+ if (strncmp($namespace, $class, $len) !== 0) {
+ // no, move to the next registered autoloader
+ return false;
+ }
+
+ // Get the relative class name
+ $relative_class = substr($class, $len);
+
+ // Replace the namespace prefix with the base directory, replace namespace
+ // separators with directory separators in the relative class name, append
+ // with .php
+ $file = dirname(__FILE__) . '/src/' . str_replace('_', '/', $relative_class) . '.php';
+ // if the file exists, require it
+ if (file_exists($file)) {
+ require_once $file;
+ return true;
+ }
+ return false;
+});
</ins><span class="cx" style="display: block; padding: 0 10px">Property changes on: trunk/src/wp-includes/sodium_compat/autoload-php7.php
</span><span class="cx" style="display: block; padding: 0 10px">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: svn:eol-style</h4></div>
<ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+native
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="trunksrcwpincludessodium_compatautoloadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/sodium_compat/autoload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sodium_compat/autoload.php 2020-09-26 21:00:19 UTC (rev 49055)
+++ trunk/src/wp-includes/sodium_compat/autoload.php 2020-09-27 04:44:01 UTC (rev 49056)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,43 +1,49 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if (!is_callable('sodiumCompatAutoloader')) {
- /**
- * Sodium_Compat autoloader.
- *
- * @param string $class Class name to be autoloaded.
- *
- * @return bool Stop autoloading?
- */
- function sodiumCompatAutoloader($class)
- {
- $namespace = 'ParagonIE_Sodium_';
- // Does the class use the namespace prefix?
- $len = strlen($namespace);
- if (strncmp($namespace, $class, $len) !== 0) {
- // no, move to the next registered autoloader
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if (PHP_VERSION_ID < 70000) {
+ if (!is_callable('sodiumCompatAutoloader')) {
+ /**
+ * Sodium_Compat autoloader.
+ *
+ * @param string $class Class name to be autoloaded.
+ *
+ * @return bool Stop autoloading?
+ */
+ function sodiumCompatAutoloader($class)
+ {
+ $namespace = 'ParagonIE_Sodium_';
+ // Does the class use the namespace prefix?
+ $len = strlen($namespace);
+ if (strncmp($namespace, $class, $len) !== 0) {
+ // no, move to the next registered autoloader
+ return false;
+ }
+
+ // Get the relative class name
+ $relative_class = substr($class, $len);
+
+ // Replace the namespace prefix with the base directory, replace namespace
+ // separators with directory separators in the relative class name, append
+ // with .php
+ $file = dirname(__FILE__) . '/src/' . str_replace('_', '/', $relative_class) . '.php';
+ // if the file exists, require it
+ if (file_exists($file)) {
+ require_once $file;
+ return true;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Get the relative class name
- $relative_class = substr($class, $len);
-
- // Replace the namespace prefix with the base directory, replace namespace
- // separators with directory separators in the relative class name, append
- // with .php
- $file = dirname(__FILE__) . '/src/' . str_replace('_', '/', $relative_class) . '.php';
- // if the file exists, require it
- if (file_exists($file)) {
- require_once $file;
- return true;
- }
- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Now that we have an autoloader, let's register it!
+ spl_autoload_register('sodiumCompatAutoloader');
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} else {
+ require_once dirname(__FILE__) . '/autoload-php7.php';
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Now that we have an autoloader, let's register it!
- spl_autoload_register('sodiumCompatAutoloader');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if (!class_exists('SodiumException', false)) {
+ require_once dirname(__FILE__) . '/src/SodiumException.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-require_once dirname(__FILE__) . '/src/SodiumException.php';
</del><span class="cx" style="display: block; padding: 0 10px"> if (PHP_VERSION_ID >= 50300) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Namespaces didn't exist before 5.3.0, so don't even try to use this
</span><span class="cx" style="display: block; padding: 0 10px"> // unless PHP >= 5.3.0
</span></span></pre></div>
<a id="trunksrcwpincludessodium_compatlibphp72compatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/sodium_compat/lib/php72compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sodium_compat/lib/php72compat.php 2020-09-26 21:00:19 UTC (rev 49055)
+++ trunk/src/wp-includes/sodium_compat/lib/php72compat.php 2020-09-27 04:44:01 UTC (rev 49056)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,6 +26,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_AEAD_CHACHA20POLY1305_IETF_NSECBYTES',
</span><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_AEAD_CHACHA20POLY1305_IETF_NPUBBYTES',
</span><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_AEAD_CHACHA20POLY1305_IETF_ABYTES',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES',
+ 'CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NSECBYTES',
+ 'CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES',
+ 'CRYPTO_AEAD_XCHACHA20POLY1305_IETF_ABYTES',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_AUTH_BYTES',
</span><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_AUTH_KEYBYTES',
</span><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_BOX_SEALBYTES',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,6 +66,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_PWHASH_OPSLIMIT_MODERATE',
</span><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_PWHASH_MEMLIMIT_SENSITIVE',
</span><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_PWHASH_OPSLIMIT_SENSITIVE',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'CRYPTO_PWHASH_SCRYPTSALSA208SHA256_SALTBYTES',
+ 'CRYPTO_PWHASH_SCRYPTSALSA208SHA256_STRPREFIX',
+ 'CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_INTERACTIVE',
+ 'CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_INTERACTIVE',
+ 'CRYPTO_PWHASH_SCRYPTSALSA208SHA256_MEMLIMIT_SENSITIVE',
+ 'CRYPTO_PWHASH_SCRYPTSALSA208SHA256_OPSLIMIT_SENSITIVE',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_SCALARMULT_BYTES',
</span><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_SCALARMULT_SCALARBYTES',
</span><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_SHORTHASH_BYTES',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,6 +94,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_SIGN_KEYPAIRBYTES',
</span><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_STREAM_KEYBYTES',
</span><span class="cx" style="display: block; padding: 0 10px"> 'CRYPTO_STREAM_NONCEBYTES',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'LIBRARY_MAJOR_VERSION',
+ 'LIBRARY_MINOR_VERSION',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'LIBRARY_VERSION_MAJOR',
</span><span class="cx" style="display: block; padding: 0 10px"> 'LIBRARY_VERSION_MINOR',
</span><span class="cx" style="display: block; padding: 0 10px"> 'VERSION_STRING'
</span></span></pre></div>
<a id="trunksrcwpincludessodium_compatsrcCompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/sodium_compat/src/Compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sodium_compat/src/Compat.php 2020-09-26 21:00:19 UTC (rev 49055)
+++ trunk/src/wp-includes/sodium_compat/src/Compat.php 2020-09-27 04:44:01 UTC (rev 49056)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,6 +44,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static $fastMult = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ const LIBRARY_MAJOR_VERSION = 9;
+ const LIBRARY_MINOR_VERSION = 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> const LIBRARY_VERSION_MAJOR = 9;
</span><span class="cx" style="display: block; padding: 0 10px"> const LIBRARY_VERSION_MINOR = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> const VERSION_STRING = 'polyfill-1.0.8';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3117,15 +3119,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * with (sans pwhash and memzero).
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @psalm-suppress MixedInferredReturnType
- * @psalm-suppress UndefinedFunction
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function library_version_major()
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (self::useNewSodiumAPI()) {
- return sodium_library_version_major();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (self::useNewSodiumAPI() && defined('SODIUM_LIBRARY_MAJOR_VERSION')) {
+ return SODIUM_LIBRARY_MAJOR_VERSION;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if (self::use_fallback('library_version_major')) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @psalm-suppress UndefinedFunction */
</ins><span class="cx" style="display: block; padding: 0 10px"> return (int) call_user_func('\\Sodium\\library_version_major');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return self::LIBRARY_VERSION_MAJOR;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3136,15 +3137,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * with (sans pwhash and memzero).
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @psalm-suppress MixedInferredReturnType
- * @psalm-suppress UndefinedFunction
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function library_version_minor()
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if (self::useNewSodiumAPI()) {
- return sodium_library_version_minor();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (self::useNewSodiumAPI() && defined('SODIUM_LIBRARY_MINOR_VERSION')) {
+ return SODIUM_LIBRARY_MINOR_VERSION;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if (self::use_fallback('library_version_minor')) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /** @psalm-suppress UndefinedFunction */
</ins><span class="cx" style="display: block; padding: 0 10px"> return (int) call_user_func('\\Sodium\\library_version_minor');
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return self::LIBRARY_VERSION_MINOR;
</span></span></pre></div>
<a id="trunksrcwpincludessodium_compatsrcFilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/sodium_compat/src/File.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/sodium_compat/src/File.php 2020-09-26 21:00:19 UTC (rev 49055)
+++ trunk/src/wp-includes/sodium_compat/src/File.php 2020-09-27 04:44:01 UTC (rev 49056)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +141,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ParagonIE_Sodium_Compat::memzero($nonce);
</span><span class="cx" style="display: block; padding: 0 10px"> ParagonIE_Sodium_Compat::memzero($ephKeypair);
</span><span class="cx" style="display: block; padding: 0 10px"> } catch (SodiumException $ex) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset($ephKeypair);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (isset($ephKeypair)) {
+ unset($ephKeypair);
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $res;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,7 +330,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ParagonIE_Sodium_Compat::memzero($nonce);
</span><span class="cx" style="display: block; padding: 0 10px"> ParagonIE_Sodium_Compat::memzero($ephKeypair);
</span><span class="cx" style="display: block; padding: 0 10px"> } catch (SodiumException $ex) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset($ephKeypair);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (isset($ephKeypair)) {
+ unset($ephKeypair);
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $res;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>