Permalink
Browse files

mnet: Remove bogus XYZ prefixes from last commit MDL-8070

  • Loading branch information...
1 parent c97fffb commit 08cb427af6455488226a521cb71e3b01768779fb donal72 committed Jan 5, 2007
Showing with 6 additions and 6 deletions.
  1. +6 −6 mnet/environment.php
View
@@ -87,8 +87,8 @@ function get_keypair() {
}
if ($this->public_key_expires > time()) {
- $this->keypair['privatekey'] = XYZopenssl_pkey_get_private($this->keypair['keypair_PEM']);
- $this->keypair['publickey'] = XYZopenssl_pkey_get_public($this->keypair['certificate']);
+ $this->keypair['privatekey'] = openssl_pkey_get_private($this->keypair['keypair_PEM']);
+ $this->keypair['publickey'] = openssl_pkey_get_public($this->keypair['certificate']);
} else {
// Key generation/rotation
@@ -130,7 +130,7 @@ function replace_keys() {
$this->keypair = array();
$this->keypair = mnet_generate_keypair();
$this->public_key = $this->keypair['certificate'];
- $details = XYZopenssl_x509_parse($this->public_key);
+ $details = openssl_x509_parse($this->public_key);
$this->public_key_expires = $details['validTo_time_t'];
set_config('openssl', implode('@@@@@@@@', $this->keypair), 'mnet');
@@ -141,14 +141,14 @@ function replace_keys() {
function get_private_key() {
if (empty($this->keypair)) $this->get_keypair();
if (isset($this->keypair['privatekey'])) return $this->keypair['privatekey'];
- $this->keypair['privatekey'] = XYZopenssl_pkey_get_private($this->keypair['keypair_PEM']);
+ $this->keypair['privatekey'] = openssl_pkey_get_private($this->keypair['keypair_PEM']);
return $this->keypair['privatekey'];
}
function get_public_key() {
if (!isset($this->keypair)) $this->get_keypair();
if (isset($this->keypair['publickey'])) return $this->keypair['publickey'];
- $this->keypair['publickey'] = XYZopenssl_pkey_get_public($this->keypair['certificate']);
+ $this->keypair['publickey'] = openssl_pkey_get_public($this->keypair['certificate']);
return $this->keypair['publickey'];
}
@@ -157,7 +157,7 @@ function get_public_key() {
* signs the hash.
*/
function sign_message($message) {
- $bool = XYZopenssl_sign($message, $signature, $this->get_private_key());
+ $bool = openssl_sign($message, $signature, $this->get_private_key());
return $signature;
}
}

0 comments on commit 08cb427

Please sign in to comment.