Navigation

← Previous Changeset
Next Changeset →

Changeset 5280

Timestamp:

02/16/08 08:43:19 (7 months ago)

Author:

morris

Message:

Add p7.encryption.authentication_error

Files:

libwired/trunk/libwired/p7/wi-p7-socket.c (modified) (13 diffs)
libwired/trunk/libwired/p7/wi-p7-spec.c (modified) (5 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

libwired/trunk/libwired/p7/wi-p7-socket.c

r5257	r5280
343	343	wi_p7_enum_t flag;
344	344
345		p7_message = wi_p7_message_with_name(WI_STR("p7.handshake"), wi_p7_socket_spec(p7_socket));
	345	p7_message = wi_p7_message_with_name(WI_STR("p7.handshake.client_handshake"), wi_p7_socket_spec(p7_socket));
346	346
347	347	if(!p7_message)
…	…
391	391	return false;
392	392
393		if(!wi_is_equal(p7_message->name, WI_STR("p7.handshake.~~reply~~"))) {
394		wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
395		WI_STR("Message should be \"p7.handshake.~~reply~~\", not \"%@\""),
	393	if(!wi_is_equal(p7_message->name, WI_STR("p7.handshake.server_handshake"))) {
	394	wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
	395	WI_STR("Message should be \"p7.handshake.server_handshake\", not \"%@\""),
396	396	p7_message->name);
397	397
…	…
475	475	return false;
476	476
477		if(!wi_is_equal(p7_message->name, WI_STR("p7.handshake"))) {
478		wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
479		WI_STR("Message should be \"p7.handshake\", not \"%@\""),
	477	if(!wi_is_equal(p7_message->name, WI_STR("p7.handshake.client_handshake"))) {
	478	wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
	479	WI_STR("Message should be \"p7.client_handshake\", not \"%@\""),
480	480	p7_message->name);
481	481
…	…
539	539	}
540	540
541		p7_message = wi_p7_message_with_name(WI_STR("p7.handshake.~~reply~~"), wi_p7_socket_spec(p7_socket));
	541	p7_message = wi_p7_message_with_name(WI_STR("p7.handshake.server_handshake"), wi_p7_socket_spec(p7_socket));
542	542
543	543	if(!p7_message)
…	…
618	618	return false;
619	619
620		if(!wi_is_equal(p7_message->name, WI_STR("p7.encryption"))) {
	620	if(!wi_is_equal(p7_message->name, WI_STR("p7.encryption.server_key"))) {
621	621	wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
622	622	WI_STR("Message should be \"p7.encryption\", not \"%@\""),
…	…
645	645	return false;
646	646
647		p7_message = wi_p7_message_with_name(WI_STR("p7.encryption.~~repl~~y"), wi_p7_socket_spec(p7_socket));
	647	p7_message = wi_p7_message_with_name(WI_STR("p7.encryption.client_key"), wi_p7_socket_spec(p7_socket));
648	648
649	649	if(!p7_message)
…	…
696	696	if(!p7_message)
697	697	return false;
	698
	699	if(wi_is_equal(p7_message->name, WI_STR("p7.encryption.authentication_error"))) {
	700	wi_error_set_libwired_error(WI_ERROR_P7_AUTHENTICATIONFAILED);
	701
	702	return false;
	703	}
698	704
699	705	if(!wi_is_equal(p7_message->name, WI_STR("p7.encryption.acknowledge"))) {
…	…
740	746	wi_string_t string, username, client_password, server_password1, *server_password2;
741	747
742		p7_message = wi_p7_message_with_name(WI_STR("p7.encryption"), wi_p7_socket_spec(p7_socket));
	748	p7_message = wi_p7_message_with_name(WI_STR("p7.encryption.server_key"), wi_p7_socket_spec(p7_socket));
743	749
744	750	if(!p7_message)
…	…
764	770	return false;
765	771
766		if(!wi_is_equal(p7_message->name, WI_STR("p7.encryption.~~repl~~y"))) {
	772	if(!wi_is_equal(p7_message->name, WI_STR("p7.encryption.client_key"))) {
767	773	wi_error_set_libwired_p7_error(WI_ERROR_P7_HANDSHAKEFAILED,
768	774	WI_STR("Message should be \"p7.encryption.reply\", not \"%@\""),
…	…
832	838	username);
833	839
	840	p7_message = wi_p7_message_with_name(WI_STR("p7.encryption.authentication_error"), wi_p7_socket_spec(p7_socket));
	841	wi_p7_socket_write_message(p7_socket, timeout, p7_message);
	842
834	843	return false;
835	844	}
…	…
848	857	WI_STR("Password mismatch for \"%@\" during key exchange"),
849	858	username);
	859
	860	p7_message = wi_p7_message_with_name(WI_STR("p7.encryption.authentication_error"), wi_p7_socket_spec(p7_socket));
	861	wi_p7_socket_write_message(p7_socket, timeout, p7_message);
850	862
851	863	return false;
…	…
1480	1492
1481	1493
1482		~~int32~~_t wi_p7_socket_write_oobdata(wi_p7_socket_t p7_socket, wi_time_interval_t timeout, const void buffer, uint32_t size) {
	1494	wi_integer_t wi_p7_socket_write_oobdata(wi_p7_socket_t p7_socket, wi_time_interval_t timeout, const void buffer, uint32_t size) {
1483	1495	const void *send_buffer;
1484	1496	void compressed_buffer = NULL, encrypted_buffer = NULL;
1485	1497	char length_buffer[_WI_P7_SOCKET_LENGTH_SIZE];
	1498	wi_integer_t result = -1;
1486	1499	uint32_t send_size, compressed_size, encrypted_size;
1487		~~int32_t result = -1;~~
1488	1500
1489	1501	send_size = size;
…	…
1533	1545
1534	1546
1535		~~int32~~_t wi_p7_socket_read_oobdata(wi_p7_socket_t p7_socket, wi_time_interval_t timeout, void out_buffer, uint32_t out_size) {
	1547	wi_integer_t wi_p7_socket_read_oobdata(wi_p7_socket_t p7_socket, wi_time_interval_t timeout, void out_buffer, uint32_t out_size) {
1536	1548	void receive_buffer = NULL, decrypted_buffer, *decompressed_buffer;
1537	1549	char length_buffer[_WI_P7_SOCKET_LENGTH_SIZE];
	1550	wi_integer_t result = -1;
1538	1551	uint32_t receive_size, decompressed_size, decrypted_size;
1539		~~int32_t result = -1;~~
1540	1552
1541	1553	if(wi_socket_read_buffer(p7_socket->socket, timeout, length_buffer, sizeof(length_buffer)) <= 0)

libwired/trunk/libwired/p7/wi-p7-spec.c

r5263	r5280
341	341	""
342	342	" <p7:messages>"
343		" <p7:message name=\"p7.handshake\" id=\"1\">"
	343	" <p7:message name=\"p7.handshake.client_handshake\" id=\"1\">"
344	344	" <p7:parameter field=\"p7.handshake.version\" use=\"required\" />"
345	345	" <p7:parameter field=\"p7.handshake.protocol_name\" use=\"required\" />"
…	…
350	350	" </p7:message>"
351	351	""
352		" <p7:message name=\"p7.handshake.~~reply~~\" id=\"2\">"
	352	" <p7:message name=\"p7.handshake.server_handshake\" id=\"2\">"
353	353	" <p7:parameter field=\"p7.handshake.version\" use=\"required\" />"
354	354	" <p7:parameter field=\"p7.handshake.protocol_name\" use=\"required\" />"
…	…
359	359	" <p7:parameter field=\"p7.handshake.compatibility_check\" />"
360	360	" </p7:message>"
361
	361	""
362	362	" <p7:message name=\"p7.handshake.acknowledge\" id=\"3\">"
363	363	" <p7:parameter field=\"p7.handshake.compatibility_check\" />"
364	364	" </p7:message>"
365	365	""
366		" <p7:message name=\"p7.encryption\" id=\"4\">"
	366	" <p7:message name=\"p7.encryption.server_key\" id=\"4\">"
367	367	" <p7:parameter field=\"p7.encryption.public_key\" use=\"required\" />"
368	368	" </p7:message>"
369	369	""
370		" <p7:message name=\"p7.encryption.~~repl~~y\" id=\"5\">"
	370	" <p7:message name=\"p7.encryption.client_key\" id=\"5\">"
371	371	" <p7:parameter field=\"p7.encryption.cipher_key\" use=\"required\" />"
372	372	" <p7:parameter field=\"p7.encryption.cipher_iv\" />"
…	…
379	379	" </p7:message>"
380	380	""
381		" <p7:message name=\"p7.compatibility_check.specification\" id=\"7\">"
	381	" <p7:message name=\"p7.encryption.authentication_error\" id=\"7\" />"
	382	""
	383	" <p7:message name=\"p7.compatibility_check.specification\" id=\"8\">"
382	384	" <p7:parameter field=\"p7.compatibility_check.specification\" use=\"required\" />"
383	385	" </p7:message>"
384	386	" "
385		" <p7:message name=\"p7.compatibility_check.status\" id=\"8\">"
	387	" <p7:message name=\"p7.compatibility_check.status\" id=\"9\">"
386	388	" <p7:parameter field=\"p7.compatibility_check.status\" use=\"required\" />"
387	389	" </p7:message>"
…	…
389	391	""
390	392	" <p7:transactions>"
391		" <p7:transaction message=\"p7.handshake\" originator=\"client\" use=\"required\">"
392		" <p7:reply message=\"p7.handshake.~~reply~~\" count=\"1\" use=\"required\" />"
	393	" <p7:transaction message=\"p7.handshake.client_handshake\" originator=\"client\" use=\"required\">"
	394	" <p7:reply message=\"p7.handshake.server_handshake\" count=\"1\" use=\"required\" />"
393	395	" </p7:transaction>"
394	396	""
395		" <p7:transaction message=\"p7.handshake.~~reply~~\" originator=\"server\" use=\"required\">"
	397	" <p7:transaction message=\"p7.handshake.server_handshake\" originator=\"server\" use=\"required\">"
396	398	" <p7:reply message=\"p7.handshake.acknowledge\" count=\"1\" use=\"required\" />"
397	399	" </p7:transaction>"
398	400	""
399		" <p7:transaction message=\"p7.encryption\" originator=\"server\" use=\"required\">"
400		" <p7:reply message=\"p7.encryption.~~repl~~y\" count=\"1\" use=\"required\" />"
	401	" <p7:transaction message=\"p7.encryption.server_key\" originator=\"server\" use=\"required\">"
	402	" <p7:reply message=\"p7.encryption.client_key\" count=\"1\" use=\"required\" />"
401	403	" </p7:transaction>"
402	404	""
403		" <p7:transaction message=\"p7.encryption.reply\" originator=\"client\" use=\"required\">"
404		" <p7:reply message=\"p7.encryption.acknowledge\" count=\"1\" use=\"required\" />"
	405	" <p7:transaction message=\"p7.encryption.client_key\" originator=\"client\" use=\"required\">"
	406	" <p7:or>"
	407	" <p7:reply message=\"p7.encryption.acknowledge\" count=\"1\" use=\"required\" />"
	408	" <p7:reply message=\"p7.encryption.authentication_error\" count=\"1\" use=\"required\" />"
	409	" </p7:or>"
405	410	" </p7:transaction>"
406	411	""

Navigation

Changeset 5280

Legend:

libwired/trunk/libwired/p7/wi-p7-socket.c

libwired/trunk/libwired/p7/wi-p7-spec.c

Download in other formats: