TclTLS: Diff

Differences From Artifact [85e46e8624]:

File tls.c — part of check-in [509dd7a9b6] at 2003-05-15 21:02:10 on branch trunk — Added password callback support and version command. Fixed memory leak. (user: razzell, size: 36240) [annotate] [blame] [check-ins using]

To Artifact [f43c6403f5]:

File tls.c — part of check-in [b423807e0e] at 2003-07-07 20:24:49 on branch trunk — * tls.c (Tls_Init): added tls::misc command provided by * tlsX509.c: Wojciech Kocjan (wojciech kocjan.org) * tests/keytest1.tcl: to expose more low-level SSL commands * tests/keytest2.tcl: (user: hobbs, size: 40433) [annotate] [blame] [check-ins using]

1 2 3 4 5 6 7 8 9 10 11 12 13 14 15	1 2 3 4 5 6 7 8 9 10 11 12 13 14 15	- +	/* * Copyright (C) 1997-1999 Matt Newman <[email protected]> * some modifications: * Copyright (C) 2000 Ajuba Solutions * Copyright (C) 2002 ActiveState Corporation * Copyright (C) 2003 Starfish Systems * * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.16 2003/0~~5/15~~ 21:02:10 ~~razzell~~ Exp $ * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.17 2003/07/07 20:24:49 hobbs Exp $ * * TLS (aka SSL) Channel - can be layered on any bi-directional * Tcl_Channel (Note: Requires Trf Core Patch) * * This was built (almost) from scratch based upon observation of * OpenSSL 0.9.2B *
︙
50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 ~~74 75 76 77 78 79 80~~ 81 82 83 84 85 86 87	50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90	+ + + - - - - - - - + + + + + + +	Tcl_Interp interp, int objc, Tcl_Obj CONST objv[])); static int StatusObjCmd _ANSI_ARGS_ ((ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj CONST objv[])); static int VersionObjCmd _ANSI_ARGS_ ((ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj CONST objv[])); static int MiscObjCmd _ANSI_ARGS_ ((ClientData clientData, Tcl_Interp interp, int objc, Tcl_Obj CONST objv[])); static SSL_CTX CTX_Init _ANSI_ARGS_((State statePtr, int proto, char key, char cert, char CAdir, char CAfile, char ciphers)); #define TLS_PROTO_SSL2 0x01 #define TLS_PROTO_SSL3 0x02 #define TLS_PROTO_TLS1 0x04 #define ENABLED(flag, mask) (((flag) & (mask)) == (mask)) / * Static data structures / #ifndef NO_DH / from openssl/apps/s_server.c / static unsigned char dh512_p[]={ 0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75, 0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F, 0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3, 0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12, 0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C, 0x47,0x74,0xE8,0x33, }; 0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75, 0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F, 0xED,0x94,0xEF,0x9C,0x8A,0x44,0x03,0xED,0x57,0x46,0x50,0xD3, 0x69,0x99,0xDB,0x29,0xD7,0x76,0x27,0x6B,0xA2,0xD3,0xD4,0x12, 0xE2,0x18,0xF4,0xDD,0x1E,0x08,0x4C,0xF6,0xD8,0x00,0x3E,0x7C, 0x47,0x74,0xE8,0x33, }; static unsigned char dh512_g[]={ 0x02, }; static DH get_dh512() { DH *dh=NULL;
︙
387 388 389 390 391 392 393 ~~394~~ 395 396 397 398 399 400 401	390 391 392 393 394 395 396 397 398 399 400 401 402 403 404	- +	Tcl_Interp interp = statePtr->interp; Tcl_Obj cmdPtr; int result; if (statePtr->password == NULL) { if (Tcl_Eval(interp, "tls::password") == TCL_OK) { char ret = (char ) Tcl_GetStringResult(interp); ~~strncpy(buf, ret, size);~~ strncpy(buf, ret, size); return strlen(ret); } else { return -1; } } cmdPtr = Tcl_DuplicateObj(statePtr->password);
︙
411 412 413 414 415 416 417 ~~418~~ 419 420 421 422 423 424 425	414 415 416 417 418 419 420 421 422 423 424 425 426 427 428	- +	Tcl_DecrRefCount(cmdPtr); Tcl_Release((ClientData) statePtr); Tcl_Release((ClientData) statePtr->interp); if (result == TCL_OK) { char ret = (char ) Tcl_GetStringResult(interp); ~~strncpy(buf, ret, size);~~ strncpy(buf, ret, size); return strlen(ret); } else { return -1; } } #endif
︙
457 458 459 460 461 462 463 ~~464~~ 465 466 467 468 469 470 471	460 461 462 463 464 465 466 467 468 469 470 471 472 473 474	- +	SSL ssl = NULL; STACK_OF(SSL_CIPHER) sk; char *cp, buf[BUFSIZ]; int index, verbose = 0; if (objc < 2 \|\| objc > 3) { Tcl_WrongNumArgs(interp, 1, objv, "protocol ?verbose?"); ~~return TCL_ERROR;~~ return TCL_ERROR; } if (Tcl_GetIndexFromObj( interp, objv[1], protocols, "protocol", 0, &index) != TCL_OK) { return TCL_ERROR; } if (objc > 2 && Tcl_GetBooleanFromObj( interp, objv[2], &verbose) != TCL_OK) {
︙
565 566 567 568 569 570 571 ~~572~~ 573 574 575 576 ~~577~~ 578 579 580 581 582 583 584 585 ~~586 587 588~~ 589 590 591 592 593 594 595 596 597 598 599 600 ~~601~~ 602 603 604 605 606 607 608	568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611	- + - + - - - + + + - +	{ Tcl_Channel chan; /* The channel to set a mode on. / State statePtr; /* client state for ssl socket / int ret = 1; if (objc != 2) { Tcl_WrongNumArgs(interp, 1, objv, "channel"); ~~return TCL_ERROR;~~ return TCL_ERROR; } chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], NULL), NULL); if (chan == (Tcl_Channel) NULL) { ~~return TCL_ERROR;~~ return TCL_ERROR; } if (channelTypeVersion == TLS_CHANNEL_VERSION_2) { / * Make sure to operate on the topmost channel / chan = Tcl_GetTopChannel(chan); } if (Tcl_GetChannelType(chan) != Tls_ChannelType()) { ~~Tcl_AppendResult(interp, "bad channel \"", Tcl_GetChannelName(chan), "\": not a TLS channel", NULL); return TCL_ERROR;~~ Tcl_AppendResult(interp, "bad channel \"", Tcl_GetChannelName(chan), "\": not a TLS channel", NULL); return TCL_ERROR; } statePtr = (State )Tcl_GetChannelInstanceData(chan); if (!SSL_is_init_finished(statePtr->ssl)) { int err; ret = Tls_WaitForConnect(statePtr, &err); if (ret < 0) { CONST char errStr = statePtr->err; Tcl_ResetResult(interp); Tcl_SetErrno(err); if (!errStr \|\| errStr == 0) { ~~errStr = Tcl_PosixError(interp);~~ errStr = Tcl_PosixError(interp); } Tcl_AppendResult(interp, "handshake failed: ", errStr, (char *) NULL); return TCL_ERROR; } }
︙
666 667 668 669 670 671 672 ~~673~~ 674 675 676 677 ~~678~~ 679 680 681 682 683 684 685	669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688	- + - +	int tls1 = 0; #endif int proto = 0; int verify = 0, require = 0, request = 1; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "channel ?options?"); ~~return TCL_ERROR;~~ return TCL_ERROR; } chan = Tcl_GetChannel(interp, Tcl_GetStringFromObj(objv[1], NULL), NULL); if (chan == (Tcl_Channel) NULL) { ~~return TCL_ERROR;~~ return TCL_ERROR; } if (channelTypeVersion == TLS_CHANNEL_VERSION_2) { /* * Make sure to operate on the topmost channel */ chan = Tcl_GetTopChannel(chan); }
︙
706 707 708 709 710 711 712 ~~713~~ 714 ~~715~~ 716 717 718 719 720 721 722	709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725	- + - +	OPTBOOL( "-ssl3", ssl3); OPTBOOL( "-tls1", tls1); OPTBAD( "option", "-cadir, -cafile, -certfile, -cipher, -command, -keyfile, -model, -password, -require, -request, -server, -ssl2, -ssl3, or -tls1"); return TCL_ERROR; } ~~if (request) verify \|= SSL_VERIFY_CLIENT_ONCE \| SSL_VERIFY_PEER;~~ if (request) verify \|= SSL_VERIFY_CLIENT_ONCE \| SSL_VERIFY_PEER; if (request && require) verify \|= SSL_VERIFY_FAIL_IF_NO_PEER_CERT; ~~if (verify == 0) verify = SSL_VERIFY_NONE;~~ if (verify == 0) verify = SSL_VERIFY_NONE; proto \|= (ssl2 ? TLS_PROTO_SSL2 : 0); proto \|= (ssl3 ? TLS_PROTO_SSL3 : 0); proto \|= (tls1 ? TLS_PROTO_TLS1 : 0); /* reset to NULL if blank string provided / if (cert && !cert) cert = NULL;
︙
815 816 817 818 819 820 821 ~~822~~ 823 824 825 826 827 828 829 830 ~~831 832~~ 833 834 ~~835~~ 836 837 838 839 840 841 842	818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845	- + - - + + - +	(ClientData) statePtr, (TCL_READABLE \| TCL_WRITABLE), chan); } if (statePtr->self == (Tcl_Channel) NULL) { /* * No use of Tcl_EventuallyFree because no possible Tcl_Preserve. / Tls_Free((char ) statePtr); ~~return TCL_ERROR;~~ return TCL_ERROR; } /* * SSL Initialization / statePtr->ssl = SSL_new(statePtr->ctx); if (!statePtr->ssl) { ~~/ SSL library error / Tcl_AppendResult(interp, "couldn't construct ssl session: ", REASON(),~~ / SSL library error / Tcl_AppendResult(interp, "couldn't construct ssl session: ", REASON(), (char ) NULL); Tls_Free((char ) statePtr); ~~return TCL_ERROR;~~ return TCL_ERROR; } / * SSL Callbacks / SSL_set_app_data(statePtr->ssl, (VOID )statePtr); /* point back to us */
︙
950 951 952 953 954 955 956 ~~957~~ 958 959 ~~960 961 962 963 964 965~~ 966 ~~967 968~~ 969 ~~970~~ 971 972 973 974 ~~975 976 977 978 979 980~~ 981 ~~982 983 984 985 986 987 988 989 990~~ 991 ~~992~~ 993 ~~994~~ 995 996 997 ~~998 999 1000 1001 1002~~ 1003 ~~1004~~ 1005 1006 1007 1008 1009 ~~1010~~ 1011 1012 1013 1014 1015 1016 1017	953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020	- + - - - - - - + + + + + + - - + + - + - - - - - - + + + + + + - - - - - - - - - + + + + + + + + + - + - + - - - - - + + + + + - + - +	} #endif /* set our certificate / if (cert != NULL) { Tcl_DStringInit(&ds); ~~if (SSL_CTX_use_certificate_file(ctx, F2N( cert, &ds),~~ if (SSL_CTX_use_certificate_file(ctx, F2N( cert, &ds), SSL_FILETYPE_PEM) <= 0) { Tcl_DStringFree(&ds); Tcl_AppendResult(interp, "unable to set certificate file ", cert, ": ", REASON(), (char ) NULL); SSL_CTX_free(ctx); return (SSL_CTX )0; } Tcl_AppendResult(interp, "unable to set certificate file ", cert, ": ", REASON(), (char ) NULL); SSL_CTX_free(ctx); return (SSL_CTX )0; } ~~/ get the private key associated with this certificate / if (key == NULL) key=cert;~~ / get the private key associated with this certificate / if (key == NULL) key=cert; ~~if (SSL_CTX_use_PrivateKey_file(ctx, F2N( key, &ds),~~ if (SSL_CTX_use_PrivateKey_file(ctx, F2N( key, &ds), SSL_FILETYPE_PEM) <= 0) { Tcl_DStringFree(&ds); / flush the passphrase which might be left in the result / Tcl_SetResult(interp, NULL, TCL_STATIC); Tcl_AppendResult(interp, "unable to set public key file ", key, " ", REASON(), (char ) NULL); SSL_CTX_free(ctx); return (SSL_CTX )0; } Tcl_AppendResult(interp, "unable to set public key file ", key, " ", REASON(), (char ) NULL); SSL_CTX_free(ctx); return (SSL_CTX )0; } Tcl_DStringFree(&ds); / Now we know that a key and cert have been set against * the SSL context / if (!SSL_CTX_check_private_key(ctx)) { Tcl_AppendResult(interp, "private key does not match the certificate public key", (char ) NULL); SSL_CTX_free(ctx); return (SSL_CTX )0; } / Now we know that a key and cert have been set against * the SSL context / if (!SSL_CTX_check_private_key(ctx)) { Tcl_AppendResult(interp, "private key does not match the certificate public key", (char ) NULL); SSL_CTX_free(ctx); return (SSL_CTX )0; } } else { ~~cert = (char)X509_get_default_cert_file();~~ cert = (char)X509_get_default_cert_file(); ~~if (SSL_CTX_use_certificate_file(ctx, cert,~~ if (SSL_CTX_use_certificate_file(ctx, cert, SSL_FILETYPE_PEM) <= 0) { #if 0 Tcl_DStringFree(&ds); Tcl_AppendResult(interp, "unable to use default certificate file ", cert, ": ", REASON(), (char ) NULL); SSL_CTX_free(ctx); return (SSL_CTX )0; Tcl_AppendResult(interp, "unable to use default certificate file ", cert, ": ", REASON(), (char ) NULL); SSL_CTX_free(ctx); return (SSL_CTX )0; #endif } } } Tcl_DStringInit(&ds); Tcl_DStringInit(&ds1); if (!SSL_CTX_load_verify_locations(ctx, F2N(CAfile, &ds), F2N(CAdir, &ds1)) \|\| ~~!SSL_CTX_set_default_verify_paths(ctx)) {~~ !SSL_CTX_set_default_verify_paths(ctx)) { #if 0 Tcl_DStringFree(&ds); Tcl_DStringFree(&ds1); / Don't currently care if this fails / Tcl_AppendResult(interp, "SSL default verify paths: ", REASON(), (char ) NULL); SSL_CTX_free(ctx);
︙
1075 1076 1077 1078 1079 1080 1081 ~~1082 1083 1084~~ 1085 1086 1087 1088 1089 1090 1091	1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094	- - - + + +	if (channelTypeVersion == TLS_CHANNEL_VERSION_2) { /* * Make sure to operate on the topmost channel / chan = Tcl_GetTopChannel(chan); } if (Tcl_GetChannelType(chan) != Tls_ChannelType()) { ~~Tcl_AppendResult(interp, "bad channel \"", Tcl_GetChannelName(chan), "\": not a TLS channel", NULL); return TCL_ERROR;~~ Tcl_AppendResult(interp, "bad channel \"", Tcl_GetChannelName(chan), "\": not a TLS channel", NULL); return TCL_ERROR; } statePtr = (State ) Tcl_GetChannelInstanceData(chan); if (objc == 2) peer = SSL_get_peer_certificate(statePtr->ssl); else peer = SSL_get_certificate(statePtr->ssl); if (peer) {
︙
1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146	1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309	+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +	Tcl_Obj objPtr; objPtr = Tcl_NewStringObj(OPENSSL_VERSION_TEXT, -1); Tcl_SetObjResult(interp, objPtr); return TCL_OK; } / ------------------------------------------------------------------- * MiscObjCmd -- misc commands * * Results: * A standard Tcl result. * * Side effects: * None. * ------------------------------------------------------------------- / static int MiscObjCmd(clientData, interp, objc, objv) ClientData clientData; /* Not used. / Tcl_Interp interp; int objc; Tcl_Obj CONST objv[]; { const char commands [] = { "req", NULL }; enum command { C_REQ, C_DUMMY }; int cmd; if (objc < 2) { Tcl_WrongNumArgs(interp, 1, objv, "subcommand ?args?"); return TCL_ERROR; } if (Tcl_GetIndexFromObj(interp, objv[1], commands, "command", 0,&cmd) != TCL_OK) { return TCL_ERROR; } switch ((enum command) cmd) { case C_REQ: { EVP_PKEY pkey=NULL; X509 cert=NULL; X509_NAME name=NULL; Tcl_Obj listv; int listc,i; BIO in=NULL,out=NULL; char k_C="",k_ST="",k_L="",k_O="",k_OU="",k_CN="",k_Email=""; char keyout,pemout,str; int keysize,serial=0,days=365; if ((objc<5) \|\| (objc>6)) { Tcl_WrongNumArgs(interp, 2, objv, "keysize keyfile certfile ?info?"); return TCL_ERROR; } if (Tcl_GetIntFromObj(interp, objv[2], &keysize) != TCL_OK) { return TCL_ERROR; } keyout=Tcl_GetString(objv[3]); pemout=Tcl_GetString(objv[4]); if (objc>=6) { if (Tcl_ListObjGetElements(interp, objv[5], &listc, &listv) != TCL_OK) { return TCL_ERROR; } if ((listc%2) != 0) { Tcl_SetResult(interp,"Information list must have even number of arguments",NULL); return TCL_ERROR; } for (i=0; i<listc; i+=2) { str=Tcl_GetString(listv[i]); if (strcmp(str,"days")==0) { if (Tcl_GetIntFromObj(interp,listv[i+1],&days)!=TCL_OK) return TCL_ERROR; } else if (strcmp(str,"serial")==0) { if (Tcl_GetIntFromObj(interp,listv[i+1],&serial)!=TCL_OK) return TCL_ERROR; } else if (strcmp(str,"serial")==0) { if (Tcl_GetIntFromObj(interp,listv[i+1],&serial)!=TCL_OK) return TCL_ERROR; } else if (strcmp(str,"C")==0) { k_C=Tcl_GetString(listv[i+1]); } else if (strcmp(str,"ST")==0) { k_ST=Tcl_GetString(listv[i+1]); } else if (strcmp(str,"L")==0) { k_L=Tcl_GetString(listv[i+1]); } else if (strcmp(str,"O")==0) { k_O=Tcl_GetString(listv[i+1]); } else if (strcmp(str,"OU")==0) { k_OU=Tcl_GetString(listv[i+1]); } else if (strcmp(str,"CN")==0) { k_CN=Tcl_GetString(listv[i+1]); } else if (strcmp(str,"Email")==0) { k_Email=Tcl_GetString(listv[i+1]); } else { Tcl_SetResult(interp,"Unknown parameter",NULL); return TCL_ERROR; } } } if ((pkey = EVP_PKEY_new()) != NULL) { if (!EVP_PKEY_assign_RSA(pkey, RSA_generate_key(keysize, 0x10001, NULL, NULL))) { Tcl_SetResult(interp,"Error generating private key",NULL); EVP_PKEY_free(pkey); return TCL_ERROR; } out=BIO_new(BIO_s_file()); BIO_write_filename(out,keyout); PEM_write_bio_PrivateKey(out,pkey,NULL,NULL,0,NULL,NULL); BIO_free_all(out); if ((cert=X509_new())==NULL) { Tcl_SetResult(interp,"Error generating certificate request",NULL); EVP_PKEY_free(pkey); return(TCL_ERROR); } X509_set_version(cert,2); ASN1_INTEGER_set(X509_get_serialNumber(cert),serial); X509_gmtime_adj(X509_get_notBefore(cert),0); X509_gmtime_adj(X509_get_notAfter(cert),(long)606024days); X509_set_pubkey(cert,pkey); name=X509_get_subject_name(cert); X509_NAME_add_entry_by_txt(name,"C", MBSTRING_ASC, k_C, -1, -1, 0); X509_NAME_add_entry_by_txt(name,"ST", MBSTRING_ASC, k_ST, -1, -1, 0); X509_NAME_add_entry_by_txt(name,"L", MBSTRING_ASC, k_L, -1, -1, 0); X509_NAME_add_entry_by_txt(name,"O", MBSTRING_ASC, k_O, -1, -1, 0); X509_NAME_add_entry_by_txt(name,"OU", MBSTRING_ASC, k_OU, -1, -1, 0); X509_NAME_add_entry_by_txt(name,"CN", MBSTRING_ASC, k_CN, -1, -1, 0); X509_NAME_add_entry_by_txt(name,"Email", MBSTRING_ASC, k_Email, -1, -1, 0); X509_set_subject_name(cert,name); if (!X509_sign(cert,pkey,EVP_md5())) { X509_free(cert); EVP_PKEY_free(pkey); Tcl_SetResult(interp,"Error signing certificate",NULL); return TCL_ERROR; } out=BIO_new(BIO_s_file()); BIO_write_filename(out,pemout); PEM_write_bio_X509(out,cert); BIO_free_all(out); X509_free(cert); EVP_PKEY_free(pkey); } else { Tcl_SetResult(interp,"Error generating private key",NULL); return TCL_ERROR; } } break; } return TCL_OK; } /* ------------------------------------------------------------------- * Tls_Free -- * * This procedure cleans up when a SSL socket based channel
︙
1226 1227 1228 1229 1230 1231 1232 ~~1233~~ 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 ~~1251~~ 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 ~~1270~~ 1271 1272 1273 1274 1275 1276 1277	1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440	- + - + - +	* create the ssl command, initialise ssl context * ------------------------------------------------------------------- / int Tls_Init(Tcl_Interp interp) / Interpreter in which the package is * to be made available. / to be made available. / { int major, minor, patchlevel, release, i; char rnd_seed[16] = "GrzSlplKqUdnnzP!"; / 16 bytes / / * The original 8.2.0 stacked channel implementation (and the patch * that preceded it) had problems with scalability and robustness. * These were address in 8.3.2 / 8.4a2, so we now require that as a * minimum for TLS 1.4+. We only support 8.2+ now (8.3.2+ preferred). / if ( #ifdef USE_TCL_STUBS Tcl_InitStubs(interp, "8.2", 0) #else Tcl_PkgRequire(interp, "Tcl", "8.2", 0) #endif == NULL) { ~~return TCL_ERROR;~~ return TCL_ERROR; } / * Get the version so we can runtime switch on available functionality. * TLS should really only be used in 8.3.2+, but the other works for * some limited functionality, so an attempt at support is made. / Tcl_GetVersion(&major, &minor, &patchlevel, &release); if ((major > 8) \|\| ((major == 8) && ((minor > 3) \|\| ((minor == 3) && (release == TCL_FINAL_RELEASE) && (patchlevel >= 2))))) { / 8.3.2+ / channelTypeVersion = TLS_CHANNEL_VERSION_2; } else { / 8.2.0 - 8.3.1 / channelTypeVersion = TLS_CHANNEL_VERSION_1; } if (SSL_library_init() != 1) { ~~Tcl_AppendResult(interp, "could not initialize SSL library", NULL);~~ Tcl_AppendResult(interp, "could not initialize SSL library", NULL); return TCL_ERROR; } SSL_load_error_strings(); ERR_load_crypto_strings(); / * Seed the random number generator in the SSL library,
︙
1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314	1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480	+ + +	(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); return Tcl_PkgProvide(interp, PACKAGE, VERSION); } /* ------------------------------------------------------ *
︙