Tera TermRevision: 7324
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7324
Author: zmatsuo
Date: 2018-12-14 00:51:57 +0900 (Fri, 14 Dec 2018)
Log Message:
-----------
訂正
Modified Paths:
--------------
trunk/TTProxy/ProxyWSockHook.h
trunk/TTProxy/YCL/include/YCL/Integer.h
trunk/TTProxy/YCL/include/YCL/Resource.h
-------------- next part --------------
Modified: trunk/TTProxy/ProxyWSockHook.h
===================================================================
--- trunk/TTProxy/ProxyWSockHook.h 2018-12-11 13:32:51 UTC (rev 7323)
+++ trunk/TTProxy/ProxyWSockHook.h 2018-12-13 15:51:57 UTC (rev 7324)
@@ -1927,107 +1927,142 @@
case IDS_UNABLE_TO_GET_ISSUER_CERT:
UTIL_get_lang_msg("MSG_UNABLE_TO_GET_ISSUER_CERT", uimsg, sizeof(uimsg),
"Unable to get Issuer Certificate");
+ break;
case IDS_UNABLE_TO_GET_CRL:
UTIL_get_lang_msg("MSG_UNABLE_TO_GET_CRL", uimsg, sizeof(uimsg),
"Unable to get Certificate CRL");
+ break;
case IDS_UNABLE_TO_DECRYPT_CERT_SIGNATURE:
UTIL_get_lang_msg("MSG_UNABLE_TO_DECRYPT_CERT_SIGNATURE", uimsg, sizeof(uimsg),
"Unable to decrypt Certificate's Signature");
+ break;
case IDS_UNABLE_TO_DECRYPT_CRL_SIGNATURE:
UTIL_get_lang_msg("MSG_UNABLE_TO_DECRYPT_CRL_SIGNATURE", uimsg, sizeof(uimsg),
"Unable to decrypt CRL's Signature");
+ break;
case IDS_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY:
UTIL_get_lang_msg("MSG_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY", uimsg, sizeof(uimsg),
"Unable to decode Issuer Public Key");
+ break;
case IDS_CERT_SIGNATURE_FAILURE:
UTIL_get_lang_msg("MSG_CERT_SIGNATURE_FAILURE", uimsg, sizeof(uimsg),
"Certificate Signature failure");
+ break;
case IDS_CRL_SIGNATURE_FAILURE:
UTIL_get_lang_msg("MSG_CRL_SIGNATURE_FAILURE", uimsg, sizeof(uimsg),
"CRL Signature failure");
+ break;
case IDS_CERT_NOT_YET_VALID:
UTIL_get_lang_msg("MSG_CERT_NOT_YET_VALID", uimsg, sizeof(uimsg),
"Certificate is not yet valid");
+ break;
case IDS_CERT_HAS_EXPIRED:
UTIL_get_lang_msg("MSG_CERT_HAS_EXPIRED", uimsg, sizeof(uimsg),
"Certificate has expired");
+ break;
case IDS_CRL_NOT_YET_VALID:
UTIL_get_lang_msg("MSG_CRL_NOT_YET_VALID", uimsg, sizeof(uimsg),
"CRL is not yet valid");
+ break;
case IDS_CRL_HAS_EXPIRED:
UTIL_get_lang_msg("MSG_CRL_HAS_EXPIRED", uimsg, sizeof(uimsg),
"CRL has expired");
+ break;
case IDS_ERROR_IN_CERT_NOT_BEFORE_FIELD:
UTIL_get_lang_msg("MSG_ERROR_IN_CERT_NOT_BEFORE_FIELD", uimsg, sizeof(uimsg),
"Format error in Certificate's notBefore field");
+ break;
case IDS_ERROR_IN_CERT_NOT_AFTER_FIELD:
UTIL_get_lang_msg("MSG_ERROR_IN_CERT_NOT_AFTER_FIELD", uimsg, sizeof(uimsg),
"Format error in Certificate's notAfter field");
+ break;
case IDS_ERROR_IN_CRL_LAST_UPDATE_FIELD:
UTIL_get_lang_msg("MSG_ERROR_IN_CRL_LAST_UPDATE_FIELD", uimsg, sizeof(uimsg),
"Format error in CRL's lastUpdate field");
+ break;
case IDS_ERROR_IN_CRL_NEXT_UPDATE_FIELD:
UTIL_get_lang_msg("MSG_ERROR_IN_CRL_NEXT_UPDATE_FIELD", uimsg, sizeof(uimsg),
"Format error in CRL's nextUpdate field");
+ break;
case IDS_OUT_OF_MEM:
UTIL_get_lang_msg("MSG_OUT_OF_MEM", uimsg, sizeof(uimsg),
"Out of memory");
+ break;
case IDS_DEPTH_ZERO_SELF_SIGNED_CERT:
UTIL_get_lang_msg("MSG_DEPTH_ZERO_SELF_SIGNED_CERT", uimsg, sizeof(uimsg),
"Self-signed Certificate");
+ break;
case IDS_SELF_SIGNED_CERT_IN_CHAIN:
UTIL_get_lang_msg("MSG_SELF_SIGNED_CERT_IN_CHAIN", uimsg, sizeof(uimsg),
"Self-signed Certificate found in Certificate chain");
+ break;
case IDS_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
UTIL_get_lang_msg("MSG_UNABLE_TO_GET_ISSUER_CERT_LOCALLY", uimsg, sizeof(uimsg),
"Unable to get Local Issuer Certificate");
+ break;
case IDS_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
UTIL_get_lang_msg("MSG_UNABLE_TO_VERIFY_LEAF_SIGNATURE", uimsg, sizeof(uimsg),
"Unable to verify the first Certificate");
+ break;
case IDS_CERT_CHAIN_TOO_LONG:
UTIL_get_lang_msg("MSG_CERT_CHAIN_TOO_LONG", uimsg, sizeof(uimsg),
"Certificate chain too long");
+ break;
case IDS_CERT_REVOKED:
UTIL_get_lang_msg("MSG_CERT_REVOKED", uimsg, sizeof(uimsg),
"Certificate revoked");
+ break;
case IDS_INVALID_CA:
UTIL_get_lang_msg("MSG_INVALID_CA", uimsg, sizeof(uimsg),
"Invalid CA Certificate");
+ break;
case IDS_PATH_LENGTH_EXCEEDED:
UTIL_get_lang_msg("MSG_PATH_LENGTH_EXCEEDED", uimsg, sizeof(uimsg),
"Path length constraint exceeded");
+ break;
case IDS_INVALID_PURPOSE:
UTIL_get_lang_msg("MSG_INVALID_PURPOSE", uimsg, sizeof(uimsg),
"Unsupported Certificate purpose");
+ break;
case IDS_CERT_UNTRUSTED:
UTIL_get_lang_msg("MSG_CERT_UNTRUSTED", uimsg, sizeof(uimsg),
"Certificate not trusted");
+ break;
case IDS_CERT_REJECTED:
UTIL_get_lang_msg("MSG_CERT_REJECTED", uimsg, sizeof(uimsg),
"Certificate rejected");
+ break;
case IDS_SUBJECT_ISSUER_MISMATCH:
UTIL_get_lang_msg("MSG_SUBJECT_ISSUER_MISMATCH", uimsg, sizeof(uimsg),
"Subject Issuer mismatch");
+ break;
case IDS_AKID_SKID_MISMATCH:
UTIL_get_lang_msg("MSG_AKID_SKID_MISMATCH", uimsg, sizeof(uimsg),
"Authority and Subject Key Identifier mismatch");
+ break;
case IDS_AKID_ISSUER_SERIAL_MISMATCH:
UTIL_get_lang_msg("MSG_AKID_ISSUER_SERIAL_MISMATCH", uimsg, sizeof(uimsg),
"Authority and Issuer Serial Number mismatch");
+ break;
case IDS_KEYUSAGE_NO_CERTSIGN:
UTIL_get_lang_msg("MSG_KEYUSAGE_NO_CERTSIGN", uimsg, sizeof(uimsg),
"Key usage does not include Certificate signing");
+ break;
case IDS_APPLICATION_VERIFICATION:
UTIL_get_lang_msg("MSG_APPLICATION_VERIFICATION", uimsg, sizeof(uimsg),
"Application verification failure");
+ break;
case IDS_UNMATCH_COMMON_NAME:
UTIL_get_lang_msg("MSG_UNMATCH_COMMON_NAME", uimsg, sizeof(uimsg),
"Unmatch Common Name");
+ break;
case IDS_UNABLE_TO_GET_COMMON_NAME:
UTIL_get_lang_msg("MSG_UNABLE_TO_GET_COMMON_NAME", uimsg, sizeof(uimsg),
"Unable to get Common Name");
+ break;
default:
uimsg[0] = NULL;
+ break;
}
return setError(s, uimsg);
}
Modified: trunk/TTProxy/YCL/include/YCL/Integer.h
===================================================================
--- trunk/TTProxy/YCL/include/YCL/Integer.h 2018-12-11 13:32:51 UTC (rev 7323)
+++ trunk/TTProxy/YCL/include/YCL/Integer.h 2018-12-13 15:51:57 UTC (rev 7324)
@@ -35,7 +35,7 @@
negative = true;
value = -value;
}
- return toString(value, 10, negative);
+ return toString(value, base, negative);
}
static String toString(unsigned long value) {
return toString(value, 10);
Modified: trunk/TTProxy/YCL/include/YCL/Resource.h
===================================================================
--- trunk/TTProxy/YCL/include/YCL/Resource.h 2018-12-11 13:32:51 UTC (rev 7323)
+++ trunk/TTProxy/YCL/include/YCL/Resource.h 2018-12-13 15:51:57 UTC (rev 7324)
@@ -82,7 +82,7 @@
return loadIcon(instance, MAKEINTRESOURCE(id), cx, cy, flags);
}
static HICON loadIcon(HINSTANCE instance, const char* id, int cx, int cy, int flags) {
- return (HICON) ::LoadImage(instance, id, IMAGE_ICON, cx, cx, flags);
+ return (HICON) ::LoadImage(instance, id, IMAGE_ICON, cx, cy, flags);
}
static HCURSOR loadCursor(int id) {
@@ -120,7 +120,7 @@
return loadCursor(instance, MAKEINTRESOURCE(id), cx, cy, flags);
}
static HCURSOR loadCursor(HINSTANCE instance, const char* id, int cx, int cy, int flags) {
- return (HCURSOR) ::LoadImage(instance, id, IMAGE_CURSOR, cx, cx, flags);
+ return (HCURSOR) ::LoadImage(instance, id, IMAGE_CURSOR, cx, cy, flags);
}
static HMENU loadMenu(int id) {