TclTLS: Diff

Differences From Artifact [a4e2c18a75]:

File generic/tls.c — part of check-in [594dfd3195] at 2023-12-29 03:09:08 on branch trunk — Merged in dh branch (user: bohagan, size: 90369) [annotate] [blame] [check-ins using] [more...]

To Artifact [afd3785b3b]:

File generic/tls.c — part of check-in [41e1203724] at 2023-12-29 21:12:52 on branch trunk — Cast unused parameters to void to prevent unused parameter warnings Source: https://core.tcl-lang.org/tcltls/tktview/086954612f (user: bohagan, size: 90378) [annotate] [blame] [check-ins using]

︙
945 946 947 948 949 950 951 952 953 954 955 956 957 958	945 946 947 948 949 950 951 952 953 954 955 956 957 958 959	+	Tcl_Obj objPtr = NULL; SSL_CTX ctx = NULL; SSL ssl = NULL; STACK_OF(SSL_CIPHER) sk; char cp, buf[BUFSIZ]; int index, verbose = 0, use_supported = 0; const SSL_METHOD method; (void) clientData; dprintf("Called"); if ((objc < 2) \|\| (objc > 4)) { Tcl_WrongNumArgs(interp, 1, objv, "protocol ?verbose? ?supported?"); return TCL_ERROR; }
︙
1071 1072 1073 1074 1075 1076 1077 ~~1078~~ 1079 1080 1081 1082 1083 1084 1085	1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085	-	} } SSL_free(ssl); SSL_CTX_free(ctx); Tcl_SetObjResult(interp, objPtr); return TCL_OK; ~~clientData = clientData;~~ } /* ------------------------------------------------------------------- * ProtocolsObjCmd -- list available protocols *
︙
1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106	1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107	+	* none * ------------------------------------------------------------------- / static int ProtocolsObjCmd(ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[]) { Tcl_Obj *objPtr; (void) clientData; dprintf("Called"); if (objc != 1) { Tcl_WrongNumArgs(interp, 1, objv, ""); return TCL_ERROR; }
︙
1126 1127 1128 1129 1130 1131 1132 ~~1133~~ 1134 1135 1136 1137 1138 1139 1140	1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140	-	#endif #if !defined(NO_TLS1_3) && !defined(OPENSSL_NO_TLS1_3) Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj(protocols[TLS_TLS1_3], -1)); #endif Tcl_SetObjResult(interp, objPtr); return TCL_OK; ~~clientData = clientData;~~ } /* ------------------------------------------------------------------- * HandshakeObjCmd -- *
︙
1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164	1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165	+	/ static int HandshakeObjCmd(ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[]) { Tcl_Channel chan; / The channel to set a mode on. / State statePtr; /* client state for ssl socket / const char errStr = NULL; int ret = 1; int err = 0; (void) clientData; dprintf("Called"); if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "channel"); return(TCL_ERROR); }
︙
1210 1211 1212 1213 1214 1215 1216 ~~1217~~ 1218 1219 1220 1221 1222 1223 1224	1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224	-	} ret = 1; } dprintf("Returning TCL_OK with data \"%i\"", ret); Tcl_SetObjResult(interp, Tcl_NewIntObj(ret)); return(TCL_OK); ~~clientData = clientData;~~ } /* ------------------------------------------------------------------- * ImportObjCmd -- *
︙
1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275	1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276	+	char servername = NULL; / hostname for Server Name Indication / const unsigned char session_id = NULL; Tcl_Obj *alpn = NULL; int ssl2 = 0, ssl3 = 0; int tls1 = 1, tls1_1 = 1, tls1_2 = 1, tls1_3 = 1; int proto = 0, level = -1; int verify = 0, require = 0, request = 1, post_handshake = 0; (void) clientData; dprintf("Called"); #if defined(NO_TLS1) \|\| defined(OPENSSL_NO_TLS1) tls1 = 0; #endif #if defined(NO_TLS1_1) \|\| defined(OPENSSL_NO_TLS1_1)
︙
1630 1631 1632 1633 1634 1635 1636 ~~1637~~ 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664	1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665	- +	/* * End of SSL Init / dprintf("Returning %s", Tcl_GetChannelName(statePtr->self)); Tcl_SetResult(interp, (char ) Tcl_GetChannelName(statePtr->self), TCL_VOLATILE); return TCL_OK; ~~clientData = clientData;~~ } /* ------------------------------------------------------------------- * UnimportObjCmd -- * * This procedure is invoked to remove the topmost channel filter. * * Results: * A standard Tcl result. * * Side effects: * May modify the behavior of an IO channel. * ------------------------------------------------------------------- / static int UnimportObjCmd(ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[]) { Tcl_Channel chan; /* The channel to set a mode on. */ (void) clientData; dprintf("Called"); if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "channel"); return TCL_ERROR; }
︙
1679 1680 1681 1682 1683 1684 1685 ~~1686~~ 1687 1688 1689 1690 1691 1692 1693	1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693	-	} if (Tcl_UnstackChannel(interp, chan) == TCL_ERROR) { return TCL_ERROR; } return TCL_OK; ~~clientData = clientData;~~ } /* ------------------------------------------------------------------- * CTX_Init -- construct a SSL_CTX instance *
︙
2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066	2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067	+	Tcl_Obj objPtr; Tcl_Channel chan; char channelName, ciphers; int mode; const unsigned char proto; unsigned int len; int nid, res; (void) clientData; dprintf("Called"); if (objc < 2 \|\| objc > 3 \|\| (objc == 3 && !strcmp(Tcl_GetString(objv[1]), "-local"))) { Tcl_WrongNumArgs(interp, 1, objv, "?-local? channel"); return TCL_ERROR; }
︙
2154 2155 2156 2157 2158 2159 2160 ~~2161~~ 2162 2163 2164 2165 2166 2167 2168	2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168	-	res = SSL_get_signature_type_nid(statePtr->ssl, &nid); } if (!res) {nid = 0;} LAPPEND_STR(interp, objPtr, "signatureType", OBJ_nid2ln(nid), -1); Tcl_SetObjResult(interp, objPtr); return TCL_OK; ~~clientData = clientData;~~ } /* ------------------------------------------------------------------- * ConnectionInfoObjCmd -- return connection info from OpenSSL. *
︙
2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189	2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190	+	Tcl_Channel chan; /* The channel to set a mode on / State statePtr; /* client state for ssl socket / Tcl_Obj objPtr, listPtr; const SSL ssl; const SSL_CIPHER cipher; const SSL_SESSION session; const EVP_MD md; (void) clientData; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "channel"); return(TCL_ERROR); } chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], (Tcl_Size )NULL), NULL);
︙
2387 2388 2389 2390 2391 2392 2393 ~~2394~~ 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 ~~2420 2421 2422~~ 2423 2424 2425 2426 2427 2428 2429	2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429	- + + + - - -	} } LAPPEND_OBJ(interp, objPtr, "caList", listPtr); LAPPEND_INT(interp, objPtr, "caListCount", sk_X509_NAME_num(ca_list)); Tcl_SetObjResult(interp, objPtr); return TCL_OK; ~~clientData = clientData;~~ } /* ------------------------------------------------------------------- * VersionObjCmd -- return version string from OpenSSL. * * Results: * A standard Tcl result. * * Side effects: * None. * ------------------------------------------------------------------- / static int VersionObjCmd(ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[]) { Tcl_Obj objPtr; (void) clientData; (void) objc; (void) objv; dprintf("Called"); objPtr = Tcl_NewStringObj(OPENSSL_VERSION_TEXT, -1); Tcl_SetObjResult(interp, objPtr); return TCL_OK; ~~clientData = clientData;~~ ~~objc = objc;~~ ~~objv = objv;~~ } / ------------------------------------------------------------------- * MiscObjCmd -- misc commands *
︙
2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451	2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452	+	static int MiscObjCmd(ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj const objv[]) { static const char *commands [] = { "req", "strreq", NULL }; enum command { C_REQ, C_STRREQ, C_DUMMY }; Tcl_Size cmd; int isStr; char buffer[16384]; (void) clientData; dprintf("Called"); if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?args?"); return TCL_ERROR; }
︙
2630 2631 2632 2633 2634 2635 2636 ~~2637~~ 2638 2639 2640 2641 2642 2643 2644	2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644	-	} } break; default: break; } return TCL_OK; ~~clientData = clientData;~~ } /*******************/ / Init / /******************/ /
︙
2770 2771 2772 2773 2774 2775 2776 ~~2777 2778 2779 2780 2781 2782 2783 2784 2785~~ 2786 2787 2788 2789 2790 2791 2792	2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792	- - - - - - - - - + + + + + + + + +	} if (TlsLibInit(0) != TCL_OK) { Tcl_AppendResult(interp, "could not initialize SSL library", (char ) NULL); return TCL_ERROR; } Tcl_CreateObjCommand(interp, "tls::ciphers", CiphersObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::connection", ConnectionInfoObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::handshake", HandshakeObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::import", ImportObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::unimport", UnimportObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::status", StatusObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::version", VersionObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::misc", MiscObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::protocols", ProtocolsObjCmd, (ClientData) 0, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::ciphers", CiphersObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::connection", ConnectionInfoObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::handshake", HandshakeObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::import", ImportObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::unimport", UnimportObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::status", StatusObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::version", VersionObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::misc", MiscObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc ) NULL); Tcl_CreateObjCommand(interp, "tls::protocols", ProtocolsObjCmd, (ClientData) NULL, (Tcl_CmdDeleteProc *) NULL); if (interp) { Tcl_Eval(interp, tlsTclInitScript); } return Tcl_PkgProvide(interp, PACKAGE_NAME, PACKAGE_VERSION); }
︙
2915 2916 2917 2918 2919 2920 2921 ~~2922~~ 2923	2915 2916 2917 2918 2919 2920 2921 2922 2923	- +	} while (RAND_status() != 1); #endif #if defined(OPENSSL_THREADS) && defined(TCL_THREADS) Tcl_MutexUnlock(&init_mx); #endif ~~return(status);~~ return(status); }