mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=3977
This commit is contained in:
parent
8c1f2ee9f2
commit
2e22f60414
|
@ -1106,8 +1106,8 @@ AC_DEFUN([SAH_HEADER_STDCXX],[
|
|||
#
|
||||
# Revision Log:
|
||||
# $Log$
|
||||
# Revision 1.131 2004/08/03 22:18:31 boincadm
|
||||
# version 4.03
|
||||
# Revision 1.132 2004/08/04 13:11:14 davea
|
||||
# *** empty log message ***
|
||||
#
|
||||
# Revision 1.1 2003/12/11 18:38:24 korpela
|
||||
# Added checked macro files into boinc
|
||||
|
|
|
@ -15828,3 +15828,13 @@ David 4 Aug 2004
|
|||
handle_request.C
|
||||
sched_config.C,h
|
||||
transitioner.C
|
||||
|
||||
David 4 Aug 2004
|
||||
- A <file_info> without a signature would cause
|
||||
the file_upload_handler to crash.
|
||||
Fixed this.
|
||||
- File upload handler: if ignore_upload_certificate is set,
|
||||
don't compute the expected signature
|
||||
|
||||
sched/
|
||||
file_upload_handler.C
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.ac Revision: 1.115 .
|
||||
# From configure.ac Revision: 1.116 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.57 for BOINC 4.03.
|
||||
#
|
||||
|
|
|
@ -212,22 +212,33 @@ int handle_file_upload(FILE* in, R_RSA_PUBLIC_KEY& key) {
|
|||
if (retval) {
|
||||
return return_error(ERR_PERMANENT, "FILE_INFO::parse");
|
||||
}
|
||||
retval = verify_string(
|
||||
file_info.signed_xml, file_info.xml_signature, key, is_valid
|
||||
);
|
||||
if (retval || !is_valid) {
|
||||
log_messages.printf(SCHED_MSG_LOG::CRITICAL,
|
||||
"verify_string() [%s] [%s] retval %d, is_valid = %d\n",
|
||||
file_info.signed_xml, file_info.xml_signature,
|
||||
retval, is_valid
|
||||
);
|
||||
if (!config.ignore_upload_certificates) {
|
||||
log_messages.printf(SCHED_MSG_LOG::NORMAL, file_info.signed_xml, "signed xml: ");
|
||||
log_messages.printf(SCHED_MSG_LOG::NORMAL, file_info.xml_signature, "signature: ");
|
||||
if (!config.ignore_upload_certificates) {
|
||||
if (!file_info.signed_xml || !file_info.xml_signature) {
|
||||
log_messages.printf(SCHED_MSG_LOG::CRITICAL,
|
||||
"file info is missing signature\n"
|
||||
);
|
||||
return return_error(ERR_PERMANENT, "invalid signature");
|
||||
continue;
|
||||
} else {
|
||||
retval = verify_string(
|
||||
file_info.signed_xml, file_info.xml_signature, key, is_valid
|
||||
);
|
||||
if (retval || !is_valid) {
|
||||
log_messages.printf(SCHED_MSG_LOG::CRITICAL,
|
||||
"verify_string() [%s] [%s] retval %d, is_valid = %d\n",
|
||||
file_info.signed_xml, file_info.xml_signature,
|
||||
retval, is_valid
|
||||
);
|
||||
log_messages.printf(SCHED_MSG_LOG::NORMAL,
|
||||
"signed xml: %s", file_info.signed_xml
|
||||
);
|
||||
log_messages.printf(SCHED_MSG_LOG::NORMAL,
|
||||
"signature: %s", file_info.xml_signature
|
||||
);
|
||||
return return_error(ERR_PERMANENT, "invalid signature");
|
||||
}
|
||||
}
|
||||
}
|
||||
continue;
|
||||
}
|
||||
else if (parse_double(buf, "<offset>", offset)) continue;
|
||||
else if (parse_double(buf, "<nbytes>", nbytes)) continue;
|
||||
|
|
Loading…
Reference in New Issue