github
/
putty
зеркало из https://github.com/github/putty.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
putty/testbn.c

276 строки
7.9 KiB
C
Исходник Обычный вид История

Promote 'testbn' to a binary built by the makefiles. This makes it easier to compile in multiple debugging modes, or on Windows, without having to constantly paste annoying test-compile commands out of comments in sshbn.c. The new binary is compiled into the build directory, but not shipped by 'make install', just like fuzzterm. Unlike fuzzterm, though, testbn is also compiled on Windows, for which we didn't already have a mechanism for building unshipped binaries; I've done the very simplest thing for the moment, of providing a target in Makefile.vc to delete them. In order to comply with the PuTTY makefile system's constraint of never compiling the same object multiple times with different ifdefs, I've also moved testbn's main() out into its own source file.
2015-12-16 17:40:00 +03:00
/*
* testbn.c: standalone test program for the bignum code.
*/
/*
* Accepts input on standard input, in the form generated by
* testdata/bignum.py.
*/
New utility function logevent_and_free. This should make it easier to do formatted-string based logging outside ssh.c, because I can wrap up a local macro in any source file I like that expands to logevent_and_free(wherever my Frontend is, dupprintf(macro argument)). It caused yet another stub function to be needed in testbn, but there we go. (Also, while I'm here, removed a redundant declaration of logevent itself from ssh.h. The one in putty.h is all we need.)
2018-09-19 19:37:00 +03:00
#include <assert.h>
Promote 'testbn' to a binary built by the makefiles. This makes it easier to compile in multiple debugging modes, or on Windows, without having to constantly paste annoying test-compile commands out of comments in sshbn.c. The new binary is compiled into the build directory, but not shipped by 'make install', just like fuzzterm. Unlike fuzzterm, though, testbn is also compiled on Windows, for which we didn't already have a mechanism for building unshipped binaries; I've done the very simplest thing for the moment, of providing a target in Makefile.vc to delete them. In order to comply with the PuTTY makefile system's constraint of never compiling the same object multiple times with different ifdefs, I've also moved testbn's main() out into its own source file.
2015-12-16 17:40:00 +03:00
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include "ssh.h"
Report the bignum word size in testbn. I've found in the last day or two that the first thing I want to do after any successful run of testbn is to check whether I was running it with the right compile settings - so I should have made it easier to find that out to begin with! Better late than never.
2015-11-29 15:04:10 +03:00
#include "sshbn.h"
Promote 'testbn' to a binary built by the makefiles. This makes it easier to compile in multiple debugging modes, or on Windows, without having to constantly paste annoying test-compile commands out of comments in sshbn.c. The new binary is compiled into the build directory, but not shipped by 'make install', just like fuzzterm. Unlike fuzzterm, though, testbn is also compiled on Windows, for which we didn't already have a mechanism for building unshipped binaries; I've done the very simplest thing for the moment, of providing a target in Makefile.vc to delete them. In order to comply with the PuTTY makefile system's constraint of never compiling the same object multiple times with different ifdefs, I've also moved testbn's main() out into its own source file.
2015-12-16 17:40:00 +03:00
void modalfatalbox(const char *p, ...)
{
va_list ap;
fprintf(stderr, "FATAL ERROR: ");
va_start(ap, p);
vfprintf(stderr, p, ap);
va_end(ap);
fputc('\n', stderr);
exit(1);
}
int random_byte(void)
{
modalfatalbox("random_byte called in testbn");
return 0;
}
Put an optional IdempotentCallback in bufchains. The callback has the same semantics as for packet queues: it triggers automatically when data is added to a bufchain, not when it's removed.
2018-09-22 10:13:41 +03:00
void queue_idempotent_callback(IdempotentCallback *ic) { assert(0); }
New utility function logevent_and_free. This should make it easier to do formatted-string based logging outside ssh.c, because I can wrap up a local macro in any source file I like that expands to logevent_and_free(wherever my Frontend is, dupprintf(macro argument)). It caused yet another stub function to be needed in testbn, but there we go. (Also, while I'm here, removed a redundant declaration of logevent itself from ssh.h. The one in putty.h is all we need.)
2018-09-19 19:37:00 +03:00
Promote 'testbn' to a binary built by the makefiles. This makes it easier to compile in multiple debugging modes, or on Windows, without having to constantly paste annoying test-compile commands out of comments in sshbn.c. The new binary is compiled into the build directory, but not shipped by 'make install', just like fuzzterm. Unlike fuzzterm, though, testbn is also compiled on Windows, for which we didn't already have a mechanism for building unshipped binaries; I've done the very simplest thing for the moment, of providing a target in Makefile.vc to delete them. In order to comply with the PuTTY makefile system's constraint of never compiling the same object multiple times with different ifdefs, I've also moved testbn's main() out into its own source file.
2015-12-16 17:40:00 +03:00
#define fromxdigit(c) ( (c)>'9' ? ((c)&0xDF) - 'A' + 10 : (c) - '0' )
Unix buildinfo: stop saying 'GTK' in pure CLI utilities. Unix PSCP, PSFTP, Plink and PuTTYgen now just report their build platform as '64-bit Unix' or '32-bit Unix', without mentioning irrelevant details of what flavour of GTK the other tools in the suite might have been built against. (In particular, they now won't imply anything outright untrue if there was no GTK present at build time at all!)
2017-02-23 01:10:05 +03:00
/* For Unix in particular, but harmless if this main() is reused elsewhere */
Convert a lot of 'int' variables to 'bool'. My normal habit these days, in new code, is to treat int and bool as _almost_ completely separate types. I'm still willing to use C's implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine, no need to spell it out as blob.len != 0), but generally, if a variable is going to be conceptually a boolean, I like to declare it bool and assign to it using 'true' or 'false' rather than 0 or 1. PuTTY is an exception, because it predates the C99 bool, and I've stuck to its existing coding style even when adding new code to it. But it's been annoying me more and more, so now that I've decided C99 bool is an acceptable thing to require from our toolchain in the first place, here's a quite thorough trawl through the source doing 'boolification'. Many variables and function parameters are now typed as bool rather than int; many assignments of 0 or 1 to those variables are now spelled 'true' or 'false'. I managed this thorough conversion with the help of a custom clang plugin that I wrote to trawl the AST and apply heuristics to point out where things might want changing. So I've even managed to do a decent job on parts of the code I haven't looked at in years! To make the plugin's work easier, I pushed platform front ends generally in the direction of using standard 'bool' in preference to platform-specific boolean types like Windows BOOL or GTK's gboolean; I've left the platform booleans in places they _have_ to be for the platform APIs to work right, but variables only used by my own code have been converted wherever I found them. In a few places there are int values that look very like booleans in _most_ of the places they're used, but have a rarely-used third value, or a distinction between different nonzero values that most users don't care about. In these cases, I've _removed_ uses of 'true' and 'false' for the return values, to emphasise that there's something more subtle going on than a simple boolean answer: - the 'multisel' field in dialog.h's list box structure, for which the GTK front end in particular recognises a difference between 1 and 2 but nearly everything else treats as boolean - the 'urgent' parameter to plug_receive, where 1 vs 2 tells you something about the specific location of the urgent pointer, but most clients only care about 0 vs 'something nonzero' - the return value of wc_match, where -1 indicates a syntax error in the wildcard. - the return values from SSH-1 RSA-key loading functions, which use -1 for 'wrong passphrase' and 0 for all other failures (so any caller which already knows it's not loading an _encrypted private_ key can treat them as boolean) - term->esc_query, and the 'query' parameter in toggle_mode in terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h, but can also hold -1 for some other intervening character that we don't support. In a few places there's an integer that I haven't turned into a bool even though it really _can_ only take values 0 or 1 (and, as above, tried to make the call sites consistent in not calling those values true and false), on the grounds that I thought it would make it more confusing to imply that the 0 value was in some sense 'negative' or bad and the 1 positive or good: - the return value of plug_accepting uses the POSIXish convention of 0=success and nonzero=error; I think if I made it bool then I'd also want to reverse its sense, and that's a job for a separate piece of work. - the 'screen' parameter to lineptr() in terminal.c, where 0 and 1 represent the default and alternate screens. There's no obvious reason why one of those should be considered 'true' or 'positive' or 'success' - they're just indices - so I've left it as int. ssh_scp_recv had particularly confusing semantics for its previous int return value: its call sites used '<= 0' to check for error, but it never actually returned a negative number, just 0 or 1. Now the function and its call sites agree that it's a bool. In a couple of places I've renamed variables called 'ret', because I don't like that name any more - it's unclear whether it means the return value (in preparation) for the _containing_ function or the return value received from a subroutine call, and occasionally I've accidentally used the same variable for both and introduced a bug. So where one of those got in my way, I've renamed it to 'toret' or 'retd' (the latter short for 'returned') in line with my usual modern practice, but I haven't done a thorough job of finding all of them. Finally, one amusing side effect of doing this is that I've had to separate quite a few chained assignments. It used to be perfectly fine to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a the 'true' defined by stdbool.h, that idiom provokes a warning from gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
const bool buildinfo_gtk_relevant = false;
Unix buildinfo: stop saying 'GTK' in pure CLI utilities. Unix PSCP, PSFTP, Plink and PuTTYgen now just report their build platform as '64-bit Unix' or '32-bit Unix', without mentioning irrelevant details of what flavour of GTK the other tools in the suite might have been built against. (In particular, they now won't imply anything outright untrue if there was no GTK present at build time at all!)
2017-02-23 01:10:05 +03:00
Promote 'testbn' to a binary built by the makefiles. This makes it easier to compile in multiple debugging modes, or on Windows, without having to constantly paste annoying test-compile commands out of comments in sshbn.c. The new binary is compiled into the build directory, but not shipped by 'make install', just like fuzzterm. Unlike fuzzterm, though, testbn is also compiled on Windows, for which we didn't already have a mechanism for building unshipped binaries; I've done the very simplest thing for the moment, of providing a target in Makefile.vc to delete them. In order to comply with the PuTTY makefile system's constraint of never compiling the same object multiple times with different ifdefs, I've also moved testbn's main() out into its own source file.
2015-12-16 17:40:00 +03:00
int main(int argc, char **argv)
{
char *buf;
int line = 0;
int passes = 0, fails = 0;
Report the bignum word size in testbn. I've found in the last day or two that the first thing I want to do after any successful run of testbn is to check whether I was running it with the right compile settings - so I should have made it easier to find that out to begin with! Better late than never.
2015-11-29 15:04:10 +03:00
printf("BIGNUM_INT_BITS = %d\n", (int)BIGNUM_INT_BITS);
Promote 'testbn' to a binary built by the makefiles. This makes it easier to compile in multiple debugging modes, or on Windows, without having to constantly paste annoying test-compile commands out of comments in sshbn.c. The new binary is compiled into the build directory, but not shipped by 'make install', just like fuzzterm. Unlike fuzzterm, though, testbn is also compiled on Windows, for which we didn't already have a mechanism for building unshipped binaries; I've done the very simplest thing for the moment, of providing a target in Makefile.vc to delete them. In order to comply with the PuTTY makefile system's constraint of never compiling the same object multiple times with different ifdefs, I've also moved testbn's main() out into its own source file.
2015-12-16 17:40:00 +03:00
while ((buf = fgetline(stdin)) != NULL) {
int maxlen = strlen(buf);
unsigned char *data = snewn(maxlen, unsigned char);
unsigned char *ptrs[5], *q;
int ptrnum;
char *bufp = buf;
line++;
q = data;
ptrnum = 0;
while (*bufp && !isspace((unsigned char)*bufp))
bufp++;
Fix a typoed end-of-string check in testbn. I was testing the actual pointer against NULL instead of testing the pointed-to character against NUL.
2017-02-14 23:39:22 +03:00
if (*bufp)
Promote 'testbn' to a binary built by the makefiles. This makes it easier to compile in multiple debugging modes, or on Windows, without having to constantly paste annoying test-compile commands out of comments in sshbn.c. The new binary is compiled into the build directory, but not shipped by 'make install', just like fuzzterm. Unlike fuzzterm, though, testbn is also compiled on Windows, for which we didn't already have a mechanism for building unshipped binaries; I've done the very simplest thing for the moment, of providing a target in Makefile.vc to delete them. In order to comply with the PuTTY makefile system's constraint of never compiling the same object multiple times with different ifdefs, I've also moved testbn's main() out into its own source file.
2015-12-16 17:40:00 +03:00
*bufp++ = '\0';
while (*bufp) {
char *start, *end;
int i;
while (*bufp && !isxdigit((unsigned char)*bufp))
bufp++;
start = bufp;
if (!*bufp)
break;
while (*bufp && isxdigit((unsigned char)*bufp))
bufp++;
end = bufp;
if (ptrnum >= lenof(ptrs))
break;
ptrs[ptrnum++] = q;
for (i = -((end - start) & 1); i < end-start; i += 2) {
unsigned char val = (i < 0 ? 0 : fromxdigit(start[i]));
val = val * 16 + fromxdigit(start[i+1]);
*q++ = val;
}
}
testbn: add a missing initialisation in argument setup. The code that parses hexadecimal test arguments out of test lines writes them into a buffer in binary form, and sets ptrs[i] to be the starting point of each argument. The idea is that ptrs[i+1]-ptrs[i] is the length of each argument - but for that to apply to the _final_ argument, we need to have set one final element in ptrs[], which I forgot to do.
2018-12-01 17:13:51 +03:00
if (ptrnum < lenof(ptrs))
ptrs[ptrnum] = q;
Promote 'testbn' to a binary built by the makefiles. This makes it easier to compile in multiple debugging modes, or on Windows, without having to constantly paste annoying test-compile commands out of comments in sshbn.c. The new binary is compiled into the build directory, but not shipped by 'make install', just like fuzzterm. Unlike fuzzterm, though, testbn is also compiled on Windows, for which we didn't already have a mechanism for building unshipped binaries; I've done the very simplest thing for the moment, of providing a target in Makefile.vc to delete them. In order to comply with the PuTTY makefile system's constraint of never compiling the same object multiple times with different ifdefs, I've also moved testbn's main() out into its own source file.
2015-12-16 17:40:00 +03:00
if (!strcmp(buf, "mul")) {
Bignum a, b, c, p;
if (ptrnum != 3) {
printf("%d: mul with %d parameters, expected 3\n", line, ptrnum);
exit(1);
}
a = bignum_from_bytes(ptrs[0], ptrs[1]-ptrs[0]);
b = bignum_from_bytes(ptrs[1], ptrs[2]-ptrs[1]);
c = bignum_from_bytes(ptrs[2], ptrs[3]-ptrs[2]);
p = bigmul(a, b);
if (bignum_cmp(c, p) == 0) {
passes++;
} else {
char *as = bignum_decimal(a);
char *bs = bignum_decimal(b);
char *cs = bignum_decimal(c);
char *ps = bignum_decimal(p);
printf("%d: fail: %s * %s gave %s expected %s\n",
line, as, bs, ps, cs);
fails++;
sfree(as);
sfree(bs);
sfree(cs);
sfree(ps);
}
freebn(a);
freebn(b);
freebn(c);
freebn(p);
} else if (!strcmp(buf, "modmul")) {
Bignum a, b, m, c, p;
if (ptrnum != 4) {
printf("%d: modmul with %d parameters, expected 4\n",
line, ptrnum);
exit(1);
}
a = bignum_from_bytes(ptrs[0], ptrs[1]-ptrs[0]);
b = bignum_from_bytes(ptrs[1], ptrs[2]-ptrs[1]);
m = bignum_from_bytes(ptrs[2], ptrs[3]-ptrs[2]);
c = bignum_from_bytes(ptrs[3], ptrs[4]-ptrs[3]);
p = modmul(a, b, m);
if (bignum_cmp(c, p) == 0) {
passes++;
} else {
char *as = bignum_decimal(a);
char *bs = bignum_decimal(b);
char *ms = bignum_decimal(m);
char *cs = bignum_decimal(c);
char *ps = bignum_decimal(p);
printf("%d: fail: %s * %s mod %s gave %s expected %s\n",
line, as, bs, ms, ps, cs);
fails++;
sfree(as);
sfree(bs);
sfree(ms);
sfree(cs);
sfree(ps);
}
freebn(a);
freebn(b);
freebn(m);
freebn(c);
freebn(p);
} else if (!strcmp(buf, "pow")) {
Bignum base, expt, modulus, expected, answer;
if (ptrnum != 4) {
printf("%d: pow with %d parameters, expected 4\n", line, ptrnum);
exit(1);
}
base = bignum_from_bytes(ptrs[0], ptrs[1]-ptrs[0]);
expt = bignum_from_bytes(ptrs[1], ptrs[2]-ptrs[1]);
modulus = bignum_from_bytes(ptrs[2], ptrs[3]-ptrs[2]);
expected = bignum_from_bytes(ptrs[3], ptrs[4]-ptrs[3]);
answer = modpow(base, expt, modulus);
if (bignum_cmp(expected, answer) == 0) {
passes++;
} else {
char *as = bignum_decimal(base);
char *bs = bignum_decimal(expt);
char *cs = bignum_decimal(modulus);
char *ds = bignum_decimal(answer);
char *ps = bignum_decimal(expected);
printf("%d: fail: %s ^ %s mod %s gave %s expected %s\n",
line, as, bs, cs, ds, ps);
fails++;
sfree(as);
sfree(bs);
sfree(cs);
sfree(ds);
sfree(ps);
}
freebn(base);
freebn(expt);
freebn(modulus);
freebn(expected);
freebn(answer);
} else if (!strcmp(buf, "divmod")) {
Bignum n, d, expect_q, expect_r, answer_q, answer_r;
Convert a lot of 'int' variables to 'bool'. My normal habit these days, in new code, is to treat int and bool as _almost_ completely separate types. I'm still willing to use C's implicit test for zero on an integer (e.g. 'if (!blob.len)' is fine, no need to spell it out as blob.len != 0), but generally, if a variable is going to be conceptually a boolean, I like to declare it bool and assign to it using 'true' or 'false' rather than 0 or 1. PuTTY is an exception, because it predates the C99 bool, and I've stuck to its existing coding style even when adding new code to it. But it's been annoying me more and more, so now that I've decided C99 bool is an acceptable thing to require from our toolchain in the first place, here's a quite thorough trawl through the source doing 'boolification'. Many variables and function parameters are now typed as bool rather than int; many assignments of 0 or 1 to those variables are now spelled 'true' or 'false'. I managed this thorough conversion with the help of a custom clang plugin that I wrote to trawl the AST and apply heuristics to point out where things might want changing. So I've even managed to do a decent job on parts of the code I haven't looked at in years! To make the plugin's work easier, I pushed platform front ends generally in the direction of using standard 'bool' in preference to platform-specific boolean types like Windows BOOL or GTK's gboolean; I've left the platform booleans in places they _have_ to be for the platform APIs to work right, but variables only used by my own code have been converted wherever I found them. In a few places there are int values that look very like booleans in _most_ of the places they're used, but have a rarely-used third value, or a distinction between different nonzero values that most users don't care about. In these cases, I've _removed_ uses of 'true' and 'false' for the return values, to emphasise that there's something more subtle going on than a simple boolean answer: - the 'multisel' field in dialog.h's list box structure, for which the GTK front end in particular recognises a difference between 1 and 2 but nearly everything else treats as boolean - the 'urgent' parameter to plug_receive, where 1 vs 2 tells you something about the specific location of the urgent pointer, but most clients only care about 0 vs 'something nonzero' - the return value of wc_match, where -1 indicates a syntax error in the wildcard. - the return values from SSH-1 RSA-key loading functions, which use -1 for 'wrong passphrase' and 0 for all other failures (so any caller which already knows it's not loading an _encrypted private_ key can treat them as boolean) - term->esc_query, and the 'query' parameter in toggle_mode in terminal.c, which _usually_ hold 0 for ESC[123h or 1 for ESC[?123h, but can also hold -1 for some other intervening character that we don't support. In a few places there's an integer that I haven't turned into a bool even though it really _can_ only take values 0 or 1 (and, as above, tried to make the call sites consistent in not calling those values true and false), on the grounds that I thought it would make it more confusing to imply that the 0 value was in some sense 'negative' or bad and the 1 positive or good: - the return value of plug_accepting uses the POSIXish convention of 0=success and nonzero=error; I think if I made it bool then I'd also want to reverse its sense, and that's a job for a separate piece of work. - the 'screen' parameter to lineptr() in terminal.c, where 0 and 1 represent the default and alternate screens. There's no obvious reason why one of those should be considered 'true' or 'positive' or 'success' - they're just indices - so I've left it as int. ssh_scp_recv had particularly confusing semantics for its previous int return value: its call sites used '<= 0' to check for error, but it never actually returned a negative number, just 0 or 1. Now the function and its call sites agree that it's a bool. In a couple of places I've renamed variables called 'ret', because I don't like that name any more - it's unclear whether it means the return value (in preparation) for the _containing_ function or the return value received from a subroutine call, and occasionally I've accidentally used the same variable for both and introduced a bug. So where one of those got in my way, I've renamed it to 'toret' or 'retd' (the latter short for 'returned') in line with my usual modern practice, but I haven't done a thorough job of finding all of them. Finally, one amusing side effect of doing this is that I've had to separate quite a few chained assignments. It used to be perfectly fine to write 'a = b = c = TRUE' when a,b,c were int and TRUE was just a the 'true' defined by stdbool.h, that idiom provokes a warning from gcc: 'suggest parentheses around assignment used as truth value'!
2018-11-02 22:23:19 +03:00
bool fail;
Promote 'testbn' to a binary built by the makefiles. This makes it easier to compile in multiple debugging modes, or on Windows, without having to constantly paste annoying test-compile commands out of comments in sshbn.c. The new binary is compiled into the build directory, but not shipped by 'make install', just like fuzzterm. Unlike fuzzterm, though, testbn is also compiled on Windows, for which we didn't already have a mechanism for building unshipped binaries; I've done the very simplest thing for the moment, of providing a target in Makefile.vc to delete them. In order to comply with the PuTTY makefile system's constraint of never compiling the same object multiple times with different ifdefs, I've also moved testbn's main() out into its own source file.
2015-12-16 17:40:00 +03:00
if (ptrnum != 4) {
printf("%d: divmod with %d parameters, expected 4\n", line, ptrnum);
exit(1);
}
n = bignum_from_bytes(ptrs[0], ptrs[1]-ptrs[0]);
d = bignum_from_bytes(ptrs[1], ptrs[2]-ptrs[1]);
expect_q = bignum_from_bytes(ptrs[2], ptrs[3]-ptrs[2]);
expect_r = bignum_from_bytes(ptrs[3], ptrs[4]-ptrs[3]);
answer_q = bigdiv(n, d);
answer_r = bigmod(n, d);
Adopt C99 <stdbool.h>'s true/false. This commit includes <stdbool.h> from defs.h and deletes my traditional definitions of TRUE and FALSE, but other than that, it's a 100% mechanical search-and-replace transforming all uses of TRUE and FALSE into the C99-standardised lowercase spellings. No actual types are changed in this commit; that will come next. This is just getting the noise out of the way, so that subsequent commits can have a higher proportion of signal.
2018-10-29 22:50:29 +03:00
fail = false;
Promote 'testbn' to a binary built by the makefiles. This makes it easier to compile in multiple debugging modes, or on Windows, without having to constantly paste annoying test-compile commands out of comments in sshbn.c. The new binary is compiled into the build directory, but not shipped by 'make install', just like fuzzterm. Unlike fuzzterm, though, testbn is also compiled on Windows, for which we didn't already have a mechanism for building unshipped binaries; I've done the very simplest thing for the moment, of providing a target in Makefile.vc to delete them. In order to comply with the PuTTY makefile system's constraint of never compiling the same object multiple times with different ifdefs, I've also moved testbn's main() out into its own source file.
2015-12-16 17:40:00 +03:00
if (bignum_cmp(expect_q, answer_q) != 0) {
char *as = bignum_decimal(n);
char *bs = bignum_decimal(d);
char *cs = bignum_decimal(answer_q);
char *ds = bignum_decimal(expect_q);
printf("%d: fail: %s / %s gave %s expected %s\n",
line, as, bs, cs, ds);
Adopt C99 <stdbool.h>'s true/false. This commit includes <stdbool.h> from defs.h and deletes my traditional definitions of TRUE and FALSE, but other than that, it's a 100% mechanical search-and-replace transforming all uses of TRUE and FALSE into the C99-standardised lowercase spellings. No actual types are changed in this commit; that will come next. This is just getting the noise out of the way, so that subsequent commits can have a higher proportion of signal.
2018-10-29 22:50:29 +03:00
fail = true;
Promote 'testbn' to a binary built by the makefiles. This makes it easier to compile in multiple debugging modes, or on Windows, without having to constantly paste annoying test-compile commands out of comments in sshbn.c. The new binary is compiled into the build directory, but not shipped by 'make install', just like fuzzterm. Unlike fuzzterm, though, testbn is also compiled on Windows, for which we didn't already have a mechanism for building unshipped binaries; I've done the very simplest thing for the moment, of providing a target in Makefile.vc to delete them. In order to comply with the PuTTY makefile system's constraint of never compiling the same object multiple times with different ifdefs, I've also moved testbn's main() out into its own source file.
2015-12-16 17:40:00 +03:00
sfree(as);
sfree(bs);
sfree(cs);
sfree(ds);
}
if (bignum_cmp(expect_r, answer_r) != 0) {
char *as = bignum_decimal(n);
char *bs = bignum_decimal(d);
char *cs = bignum_decimal(answer_r);
char *ds = bignum_decimal(expect_r);
printf("%d: fail: %s mod %s gave %s expected %s\n",
line, as, bs, cs, ds);
Adopt C99 <stdbool.h>'s true/false. This commit includes <stdbool.h> from defs.h and deletes my traditional definitions of TRUE and FALSE, but other than that, it's a 100% mechanical search-and-replace transforming all uses of TRUE and FALSE into the C99-standardised lowercase spellings. No actual types are changed in this commit; that will come next. This is just getting the noise out of the way, so that subsequent commits can have a higher proportion of signal.
2018-10-29 22:50:29 +03:00
fail = true;
Promote 'testbn' to a binary built by the makefiles. This makes it easier to compile in multiple debugging modes, or on Windows, without having to constantly paste annoying test-compile commands out of comments in sshbn.c. The new binary is compiled into the build directory, but not shipped by 'make install', just like fuzzterm. Unlike fuzzterm, though, testbn is also compiled on Windows, for which we didn't already have a mechanism for building unshipped binaries; I've done the very simplest thing for the moment, of providing a target in Makefile.vc to delete them. In order to comply with the PuTTY makefile system's constraint of never compiling the same object multiple times with different ifdefs, I've also moved testbn's main() out into its own source file.
2015-12-16 17:40:00 +03:00
sfree(as);
sfree(bs);
sfree(cs);
sfree(ds);
}
freebn(n);
freebn(d);
freebn(expect_q);
freebn(expect_r);
freebn(answer_q);
freebn(answer_r);
if (fail)
fails++;
else
passes++;
} else {
printf("%d: unrecognised test keyword: '%s'\n", line, buf);
exit(1);
}
sfree(buf);
sfree(data);
}
printf("passed %d failed %d total %d\n", passes, fails, passes+fails);
return fails != 0;
}