Differences From Artifact [2a45eea685]:

• File generic/tlsEncrypt.c — part of check-in [191f8b29bc] at 2023-12-04 00:30:53 on branch crypto — Improved key and iv storage to use zero padded buffer to ensure no buffer overrun in OpenSSL API if string pointer is used. Added cipher default option for encrypt and decrypt. Pass data as last arg without -data option. (user: bohagan, size: 38169) [annotate] [blame] [check-ins using]

To Artifact [6005ec3c3c]:

• File generic/tlsEncrypt.c — part of check-in [d4c2159faf] at 2023-12-11 05:24:46 on branch crypto — Added KDF module to derive keys and ivs from passwords and salts. Added -hash option as alias for -digest. (user: bohagan, size: 38198) [annotate] [blame] [check-ins using]

1246
1247
1248
1249
1250
1251
1252

1253
1254
1255
1256
1257
1258
1259

	OPTSTR("-chan", channel);
	OPTSTR("-channel", channel);
	OPTOBJ("-cipher", cipherObj);
	OPTOBJ("-command", cmdObj);
	OPTOBJ("-data", dataObj);
	OPTOBJ("-digest", digestObj);

	OPTOBJ("-infile", inFileObj);
	OPTOBJ("-outfile", outFileObj);
	OPTOBJ("-key", keyObj);
	OPTOBJ("-iv", ivObj);
	OPTOBJ("-mac", macObj);

	OPTBAD("option", "-chan, -channel, -cipher, -command, -data, -digest, -infile, -key, -iv, -mac, -outfile");

>

1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260

	OPTSTR("-chan", channel);
	OPTSTR("-channel", channel);
	OPTOBJ("-cipher", cipherObj);
	OPTOBJ("-command", cmdObj);
	OPTOBJ("-data", dataObj);
	OPTOBJ("-digest", digestObj);
	OPTOBJ("-hash", digestObj);
	OPTOBJ("-infile", inFileObj);
	OPTOBJ("-outfile", outFileObj);
	OPTOBJ("-key", keyObj);
	OPTOBJ("-iv", ivObj);
	OPTOBJ("-mac", macObj);

	OPTBAD("option", "-chan, -channel, -cipher, -command, -data, -digest, -infile, -key, -iv, -mac, -outfile");