From e25e11a11314c7d8181c4cdc6a4cd4314847355d Mon Sep 17 00:00:00 2001
From: Martin Nilsson <nilsson@opera.com>
Date: Mon, 1 Sep 2014 15:31:00 +0200
Subject: [PATCH] Reference .Cipher without prefix.

---
 lib/modules/SSL.pmod/Cipher.pmod | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/modules/SSL.pmod/Cipher.pmod b/lib/modules/SSL.pmod/Cipher.pmod
index 0cabecc2e9..05d002eddb 100644
--- a/lib/modules/SSL.pmod/Cipher.pmod
+++ b/lib/modules/SSL.pmod/Cipher.pmod
@@ -594,7 +594,7 @@ class KeyExchangeDH
 {
   inherit KeyExchange;
 
-  .Cipher.DHKeyExchange dh_state; /* For diffie-hellman key exchange */
+  DHKeyExchange dh_state; /* For diffie-hellman key exchange */
 
   ADT.struct server_key_params()
   {
@@ -605,8 +605,7 @@ class KeyExchangeDH
     anonymous = 1;
     struct = ADT.struct();
 
-    dh_state =
-      .Cipher.DHKeyExchange(Crypto.DH.Parameters(session->private_key));
+    dh_state = DHKeyExchange(Crypto.DH.Parameters(session->private_key));
     dh_state->secret = session->private_key->get_x();
 
     // RFC 4346 7.4.3:
@@ -633,7 +632,7 @@ class KeyExchangeDH
     anonymous = 1;
     if (!dh_state) {
       dh_state =
-	.Cipher.DHKeyExchange(Crypto.DH.Parameters(session->peer_public_key));
+	DHKeyExchange(Crypto.DH.Parameters(session->peer_public_key));
       dh_state->other = session->peer_public_key->get_y();
     }
     dh_state->new_secret(context->random);
@@ -784,7 +783,7 @@ class KeyExchangeDHE
     Gmp.mpz order = [object(Gmp.mpz)]((p-1)/2); // FIXME: Is this correct?
     temp_struct->put_bignum(p);
     temp_struct->put_bignum(g);
-    dh_state = .Cipher.DHKeyExchange(Crypto.DH.Parameters(p, g, order));
+    dh_state = DHKeyExchange(Crypto.DH.Parameters(p, g, order));
     dh_state->set_other(input->get_bignum());
     temp_struct->put_bignum(dh_state->other);
 
-- 
GitLab