diff --git a/lib/7.4/modules/Crypto.pmod/invert.pike b/lib/7.4/modules/Crypto.pmod/invert.pike
index 2c2cbc51bc54c719c1da627a2212c7d4f21eb155..04d9103f4c1c5fa94d19bb5bcbc30c40ccd0025c 100644
--- a/lib/7.4/modules/Crypto.pmod/invert.pike
+++ b/lib/7.4/modules/Crypto.pmod/invert.pike
@@ -1,6 +1,6 @@
#pike 7.5
#pragma strict_types
-// $Id: invert.pike,v 1.1 2003/08/06 23:52:42 nilsson Exp $
+// $Id: invert.pike,v 1.2 2008/01/05 14:22:40 grubba Exp $
//! Inversion crypto module.
@@ -16,10 +16,10 @@ int(8..8) query_block_size() { return 8; }
int(0..0) query_key_length() { return 0; }
//! Set the encryption key (currently a no op).
-void set_encrypt_key(string data) {}
+void set_encrypt_key(string key) {key;}
//! Set the decryption key (currently a no op).
-void set_decrypt_key(string data) {}
+void set_decrypt_key(string key) {key;}
//! De/encrypt the string @[data] with the invert crypto
//! (ie invert the string).
diff --git a/lib/modules/Protocols.pmod/DNS.pmod b/lib/modules/Protocols.pmod/DNS.pmod
index 65528628c88d029b9c6c3d9b71fc34330e891d91..283a3ad5e9a72435e38323086889938dad1616a5 100644
--- a/lib/modules/Protocols.pmod/DNS.pmod
+++ b/lib/modules/Protocols.pmod/DNS.pmod
@@ -1,4 +1,4 @@
-// $Id: DNS.pmod,v 1.91 2007/04/07 13:30:13 grubba Exp $
+// $Id: DNS.pmod,v 1.92 2008/01/05 14:45:21 grubba Exp $
// Not yet finished -- Fredrik Hubinette
//! Domain Name System
@@ -474,7 +474,6 @@ class protocol
m->length=sizeof(s);
array(string) tmp=({});
- int e;
array(int) next=({12});
m->qd = allocate(m->qdcount);
@@ -1324,7 +1323,6 @@ class async_client
void get_mx_all(string host, function callback, mixed ... args)
{
- mapping m;
if(sizeof(domains) && host[-1] != '.' && sizeof(host/".") < 3) {
do_query(host, C_IN, T_MX,
generic_get, 0, 1, T_MX, "mx", host, callback, @args);
diff --git a/lib/modules/Protocols.pmod/HTTP.pmod/Query.pike b/lib/modules/Protocols.pmod/HTTP.pmod/Query.pike
index e6bc4941faa9ee8321c0e1256b5945b9b0d3bbf6..0c55b0034ae2e8367bcea1611e82dc4abebfb736 100644
--- a/lib/modules/Protocols.pmod/HTTP.pmod/Query.pike
+++ b/lib/modules/Protocols.pmod/HTTP.pmod/Query.pike
@@ -1,6 +1,6 @@
#pike __REAL_VERSION__
-// $Id: Query.pike,v 1.91 2007/12/13 11:41:05 per Exp $
+// $Id: Query.pike,v 1.92 2008/01/05 14:46:38 grubba Exp $
//! Open and execute an HTTP query.
//!
@@ -203,7 +203,6 @@ static void connect(string server,int port,int blocking)
SSL_rsa_export_with_des40_cbc_sha,
#endif /* 0 */
});
- string ref;
context->random = Crypto.Random.random_string;
object read_callback=con->query_read_callback();
@@ -347,7 +346,6 @@ void async_got_host(string server,int port)
SSL_rsa_with_rc4_128_md5,
SSL_rsa_with_3des_ede_cbc_sha,
});
- string ref;
context->random = Crypto.Random.random_string;
ssl = SSL.sslfile(con, context, 1,0);
diff --git a/lib/modules/Standards.pmod/ASN1.pmod/Types.pmod b/lib/modules/Standards.pmod/ASN1.pmod/Types.pmod
index c71ae7ece17e7c3aa7a0a958418dac4daecfd586..ef4b9af395bacc78a7acac6994ed8882fd2f0b1a 100644
--- a/lib/modules/Standards.pmod/ASN1.pmod/Types.pmod
+++ b/lib/modules/Standards.pmod/ASN1.pmod/Types.pmod
@@ -1,5 +1,5 @@
//
-// $Id: Types.pmod,v 1.39 2007/05/13 18:59:42 mast Exp $
+// $Id: Types.pmod,v 1.40 2008/01/05 14:37:59 grubba Exp $
//
//! Encodes various asn.1 objects according to the Distinguished
@@ -91,9 +91,9 @@ class Object
mapping(int:program(Object)) element_types(int i,
mapping(int:program(Object)) types) {
- return types;
+ return types; i;
}
- this_program init(mixed ... args) { return this; }
+ this_program init(mixed ... args) { return this; args; }
string to_base_128(int n) {
if (!n)
@@ -532,7 +532,7 @@ class Identifier
//! always the case...
int(1..1) asn1_utf8_valid (string s)
{
- return 1;
+ return 1; s;
}
//! UTF8 string object
@@ -1078,7 +1078,7 @@ class UTC
//!
int(0..0) asn1_universal_valid (string s)
{
- return 0; // Return 0 since the UniversalString isn't implemented.
+ return 0; s; // Return 0 since the UniversalString isn't implemented.
}
//! Universal String object
@@ -1099,7 +1099,7 @@ class UniversalString
}
this_program decode_primitive (string contents) {
- error( "Decoding not implemented\n" );
+ error( "Decoding not implemented\n" ); contents;
}
}
diff --git a/src/testsuite.in b/src/testsuite.in
index 6f033dd49bd602ea39b92bc5589f3c0d993aea9e..185ff073abbc4e60b9b08bcf330e41839b0f8bcc 100644
--- a/src/testsuite.in
+++ b/src/testsuite.in
@@ -1,5 +1,5 @@
START_MARKER
-test_true([["$Id: testsuite.in,v 1.793 2008/01/04 12:03:46 grubba Exp $"]]);
+test_true([["$Id: testsuite.in,v 1.794 2008/01/05 14:23:01 grubba Exp $"]]);
// This triggered a bug only if run sufficiently early.
test_compile_any([[#pike 7.2]])
@@ -6499,7 +6499,7 @@ test_compile_error([[void f() {int i; void i() {};}]]);
test_compile_error([[void f (int i) {string i;}]]);
// Not yet cataloged
-test_any(int i=10; { int i; } return i, 10)
+test_any(int i=10; { int i=0; } return i, 10)
test_program(void foo(int a, int b){} function(int,int:void) a() { return foo; })
test_program(void foo(int a, int ... b){} function(int,int ...:void) a() { return foo; })
test_program(void foo(){} function(:void) a() { return foo; })
@@ -6568,22 +6568,22 @@ test_any([[mixed a; sscanf("11","%1D",a); return a]],1)
test_any([[mixed a; sscanf("0x11","%D",a); return a]],0x11)
test_any([[mixed a; sscanf("011","%D",a); return a]],011)
-test_any([[mixed a,b; return sscanf("11foo","%dfoo",a)]],1)
-test_any([[mixed a,b; sscanf("11foo","%dfoo",a); return a]],11)
+test_any([[mixed a; return sscanf("11foo","%dfoo",a)]],1)
+test_any([[mixed a; sscanf("11foo","%dfoo",a); return a]],11)
test_any([[mixed a,b; return sscanf("11foo","%d%s",a,b)]],2)
test_any([[mixed a,b; sscanf("11foo","%d%s",a,b); return b]],"foo")
test_any([[mixed a,b; return sscanf("foo","%c%s",b,a)]],2)
test_any([[mixed a,b; sscanf("foo","%c%s",b,a); return b]],'f')
test_any([[mixed a,b; sscanf("foo","%c%s",b,a); return a]],"oo")
-test_any([[mixed a,b; return sscanf("1.0","%f",a),a]],1.0)
-test_any([[mixed a,b; return sscanf("-1.0","%f",a),a]],-1.0)
-test_any([[mixed a,b; return sscanf("1.25","%f",a),a]],1.25)
-test_any([[mixed a,b; return sscanf("-1.25","%f",a),a]],-1.25)
-test_any([[mixed a,b; return sscanf("1.25e3","%f",a),a]],1.25e3)
-test_any([[mixed a,b; return sscanf("-1.25e3","%f",a),a]],-1.25e3)
-test_any([[mixed a,b; return sscanf("1.25e-3","%f",a),a]],1.25e-3)
-test_any([[mixed a,b; return sscanf("-1.25e-3","%f",a),a]],-1.25e-3)
-test_any([[mixed a,b; sscanf("1.0","%f",a); return a]],1.0)
+test_any([[mixed a; return sscanf("1.0","%f",a),a]],1.0)
+test_any([[mixed a; return sscanf("-1.0","%f",a),a]],-1.0)
+test_any([[mixed a; return sscanf("1.25","%f",a),a]],1.25)
+test_any([[mixed a; return sscanf("-1.25","%f",a),a]],-1.25)
+test_any([[mixed a; return sscanf("1.25e3","%f",a),a]],1.25e3)
+test_any([[mixed a; return sscanf("-1.25e3","%f",a),a]],-1.25e3)
+test_any([[mixed a; return sscanf("1.25e-3","%f",a),a]],1.25e-3)
+test_any([[mixed a; return sscanf("-1.25e-3","%f",a),a]],-1.25e-3)
+test_any([[mixed a; sscanf("1.0","%f",a); return a]],1.0)
test_any([[mixed a,b; sscanf("-z ","%[-z]%s",a,b); return a]],"-z")
test_any([[mixed a,b; sscanf("-z ","%[z-]%s",a,b); return a]],"-z")
test_any([[mixed a,b; sscanf("abcdeFGji","%[a-z]%s",a,b); return a]],"abcde")
@@ -7568,7 +7568,7 @@ test_any([[
test_any([[
mapping m=([1:2,3:5,7:11,13:17]);
- foreach(m ; int a ; int b) m_delete(m,a);
+ foreach(m; int a; int b) if (m_delete(m,a) != b) return -1;
return sizeof(m);
]],0)
@@ -7598,7 +7598,7 @@ test_any([[
x[o] = 1;
destruct (o);
int i;
- foreach (x; object p;) i++;
+ foreach (x;;) i++;
return i;
]], 0)
@@ -7608,7 +7608,7 @@ test_any([[
x[o] = 1;
destruct (o);
int i;
- foreach (x; object p;) i++;
+ foreach (x;;) i++;
return i;
]], 0)
@@ -7835,6 +7835,7 @@ test_any_equal([[
foreach (({1, 2}), int y) {
if (i >= 3) break foo;
if (i >= 2) continue foo;
+ y;
}
res += ({i});
}
@@ -7938,7 +7939,7 @@ test_do([[
gnu(@indices (all_constants()), gauge {
foreach (({1,2,3}), int j)
do
- if (gnu(@indices (all_constants()),
+ if (j && gnu(@indices (all_constants()),
17 + gauge {break;}))
return 0;
while (0);
@@ -7950,7 +7951,7 @@ foo:
gnu(@indices (all_constants()), gauge {
foreach (({1,2,3}), int j)
do
- if (gnu(@indices (all_constants()),
+ if (j && gnu(@indices (all_constants()),
17 + gauge {break foo;}))
return 0;
while (0);
@@ -8255,8 +8256,8 @@ return FOOa;
test_any([[
#define FOOa array
-FOOa(int) b;
-return 1;
+FOOa(int) b = ({0});
+return sizeof(b);
]],1)
test_any([[
@@ -11002,6 +11003,7 @@ test_compile(
error("bah\n");
return ({});
};
+ tz_ux(0);
]]);
// string[]=