From 5a4ac6264bf5d376191ecfb5c8dd459e1cfa492c Mon Sep 17 00:00:00 2001
From: Martin Nilsson <nilsson@opera.com>
Date: Wed, 19 Mar 2014 13:41:50 +0100
Subject: [PATCH] Minor tweaks
---
lib/modules/SSL.pmod/state.pike | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/modules/SSL.pmod/state.pike b/lib/modules/SSL.pmod/state.pike
index edc28c43f1..fde22c737e 100644
--- a/lib/modules/SSL.pmod/state.pike
+++ b/lib/modules/SSL.pmod/state.pike
@@ -9,10 +9,9 @@
import .Constants;
-void create(object/*(.session)*/ s)
+protected void create(object/*(.session)*/ s)
{
session = s;
- seq_num = Gmp.mpz(0);
}
//! Information about the used algorithms.
@@ -27,7 +26,7 @@ object/*(.session)*/ session;
object compress;
//! 64-bit sequence number.
-Gmp.mpz seq_num; /* Bignum, values 0, .. 2^64-1 are valid */
+Gmp.mpz seq_num = Gmp.mpz(0); /* Bignum, values 0, .. 2^64-1 are valid */
//!
constant Alert = .alert;
@@ -41,14 +40,14 @@ string salt;
string tls_pad(string data, int blocksize) {
int plen=(blocksize-(sizeof(data)+1)%blocksize)%blocksize;
- return data + sprintf("%c",plen)*plen+sprintf("%c",plen);
+ return data + sprintf("%1c",plen)*(plen+1);
}
string tls_unpad(string data)
{
int(0..255) plen=[int(0..255)]data[-1];
- string padding=reverse(data)[..plen];
+ string padding=data[<plen..];
string ret = data[..<plen+1];
--
GitLab