Overview
Comment: | Moved common get cipher, digest, etc. functions to tlsUtil.c file. Renamed tlsKey.c to tlsKDF.c to better reflect contents. Standardized error messages. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | crypto |
Files: | files | file ages | folders |
SHA3-256: |
94f8408d0d20d0089c7a6f8a5bbd6280 |
User & Date: | bohagan on 2023-12-24 22:57:35 |
Other Links: | branch diff | manifest | tags |
Context
2023-12-25
| ||
02:04 | Added KDF test cases check-in: 4cc32676a2 user: bohagan tags: crypto | |
2023-12-24
| ||
22:57 | Moved common get cipher, digest, etc. functions to tlsUtil.c file. Renamed tlsKey.c to tlsKDF.c to better reflect contents. Standardized error messages. check-in: 94f8408d0d user: bohagan tags: crypto | |
06:36 | Added MAC test vectors. Added all.tcl files to each test subdirectory so all tests run. Updated Hash and KDF test vectors to add missing cleanupTests. Corrected bug with using dash in constraints. Added constraints for ciphers, digests, and kdfs. check-in: feef0d0cef user: bohagan tags: crypto | |
Changes
Modified configure from [39b72b8793] to [5d330fed91].
︙ | ︙ | |||
5392 5393 5394 5395 5396 5397 5398 | # stub library C source files to compile in TEA_ADD_STUB_SOURCES, # and runtime Tcl library files in TEA_ADD_TCL_SOURCES. # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS # and PKG_TCL_SOURCES. #----------------------------------------------------------------------- | | | 5392 5393 5394 5395 5396 5397 5398 5399 5400 5401 5402 5403 5404 5405 5406 | # stub library C source files to compile in TEA_ADD_STUB_SOURCES, # and runtime Tcl library files in TEA_ADD_TCL_SOURCES. # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS # and PKG_TCL_SOURCES. #----------------------------------------------------------------------- vars="tls.c tlsBIO.c tlsDigest.c tlsEncrypt.c tlsInfo.c tlsIO.c tlsKDF.c tlsUtil.c tlsX509.c" for i in $vars; do case $i in \$*) # allow $-var names PKG_SOURCES="$PKG_SOURCES $i" PKG_OBJECTS="$PKG_OBJECTS $i" ;; |
︙ | ︙ |
Modified configure.ac from [c43a3df459] to [f02a7eeac0].
︙ | ︙ | |||
67 68 69 70 71 72 73 | # public headers that need to be installed in TEA_ADD_HEADERS, # stub library C source files to compile in TEA_ADD_STUB_SOURCES, # and runtime Tcl library files in TEA_ADD_TCL_SOURCES. # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS # and PKG_TCL_SOURCES. #----------------------------------------------------------------------- | | | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | # public headers that need to be installed in TEA_ADD_HEADERS, # stub library C source files to compile in TEA_ADD_STUB_SOURCES, # and runtime Tcl library files in TEA_ADD_TCL_SOURCES. # This defines PKG(_STUB)_SOURCES, PKG(_STUB)_OBJECTS, PKG_HEADERS # and PKG_TCL_SOURCES. #----------------------------------------------------------------------- TEA_ADD_SOURCES([tls.c tlsBIO.c tlsDigest.c tlsEncrypt.c tlsInfo.c tlsIO.c tlsKDF.c tlsUtil.c tlsX509.c]) TEA_ADD_HEADERS([generic/tls.h]) TEA_ADD_INCLUDES([]) TEA_ADD_LIBS([]) TEA_ADD_CFLAGS([]) TEA_ADD_STUB_SOURCES([]) TEA_ADD_TCL_SOURCES([library/tls.tcl]) |
︙ | ︙ |
Modified generic/tlsDigest.c from [10998241d5] to [f2bddde2af].
︙ | ︙ | |||
145 146 147 148 149 150 151 | * Side effects: * No result or error message * *------------------------------------------------------------------- */ int DigestInitialize(Tcl_Interp *interp, DigestState *statePtr, Tcl_Obj *digestObj, Tcl_Obj *cipherObj, Tcl_Obj *keyObj, Tcl_Obj *macObj) { | | < | > > > > > > > > > > > > > > > > > > > | 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 | * Side effects: * No result or error message * *------------------------------------------------------------------- */ int DigestInitialize(Tcl_Interp *interp, DigestState *statePtr, Tcl_Obj *digestObj, Tcl_Obj *cipherObj, Tcl_Obj *keyObj, Tcl_Obj *macObj) { int res = 0, type = statePtr->format & 0xFF0; const EVP_MD *md = NULL; const EVP_CIPHER *cipher = NULL; const void *key = NULL, *iv = NULL, *salt = NULL; int key_len = 0; dprintf("Called"); /* Get digest */ md = Util_GetDigest(interp, digestObj, type != TYPE_CMAC); if (md == NULL && type != TYPE_CMAC) { return TCL_ERROR; } /* Get cipher */ cipher = Util_GetCipher(interp, cipherObj, type == TYPE_CMAC); if (cipher == NULL && type == TYPE_CMAC) { return TCL_ERROR; } /* Get key */ key = (const void *) Util_GetKey(interp, keyObj, &key_len, "key", 0, type != TYPE_MD); if (key == NULL && type != TYPE_MD) { return TCL_ERROR; } /* Create contexts */ switch(type) { case TYPE_MD: statePtr->ctx = EVP_MD_CTX_new(); res = (statePtr->ctx != NULL); break; |
︙ | ︙ | |||
174 175 176 177 178 179 180 | } if (!res) { Tcl_AppendResult(interp, "Create context failed", NULL); return TCL_ERROR; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 | } if (!res) { Tcl_AppendResult(interp, "Create context failed", NULL); return TCL_ERROR; } /* Initialize cryptography function */ switch(type) { case TYPE_MD: res = EVP_DigestInit_ex(statePtr->ctx, md, NULL); break; case TYPE_HMAC: res = HMAC_Init_ex(statePtr->hctx, key, key_len, md, NULL); break; case TYPE_CMAC: res = CMAC_Init(statePtr->cctx, key, key_len, cipher, NULL); break; } if (!res) { Tcl_AppendResult(interp, "Initialize failed: ", REASON(), NULL); return TCL_ERROR; } |
︙ | ︙ | |||
1311 1312 1313 1314 1315 1316 1317 | if (macObj != NULL) { char *macName = Tcl_GetStringFromObj(macObj, NULL); if (strcmp(macName,"cmac") == 0) { type = TYPE_CMAC; } else if (strcmp(macName,"hmac") == 0) { type = TYPE_HMAC; } else { | | | | | 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 1310 | if (macObj != NULL) { char *macName = Tcl_GetStringFromObj(macObj, NULL); if (strcmp(macName,"cmac") == 0) { type = TYPE_CMAC; } else if (strcmp(macName,"hmac") == 0) { type = TYPE_HMAC; } else { Tcl_AppendResult(interp, "invalid MAC \"", macName, "\"", NULL); return TCL_ERROR; } } else { Tcl_AppendResult(interp, "no MAC", NULL); return TCL_ERROR; } } /* Calc digest on file, stacked channel, using instance command, or data blob */ if (fileObj != NULL) { res = DigestFileHandler(interp, fileObj, digestObj, cipherObj, format | type, keyObj, macObj); } else if (channel != NULL) { res = DigestChannelHandler(interp, channel, digestObj, cipherObj, format | type, keyObj, macObj); } else if (cmdObj != NULL) { res = DigestCommandHandler(interp, cmdObj, digestObj, cipherObj, format | type, keyObj, macObj); } else if (dataObj != NULL) { res = DigestDataHandler(interp, dataObj, digestObj, cipherObj, format | type, keyObj, macObj); } else { Tcl_AppendResult(interp, "No operation: Use -channel, -command, -data, or -file option", NULL); res = TCL_ERROR; } return res; } /* *------------------------------------------------------------------- |
︙ | ︙ |
Modified generic/tlsEncrypt.c from [5bdc760fa1] to [f6412740bf].
︙ | ︙ | |||
134 135 136 137 138 139 140 | * No result or error message * *------------------------------------------------------------------- */ int EncryptInitialize(Tcl_Interp *interp, int type, EVP_CIPHER_CTX **ctx, Tcl_Obj *cipherObj, Tcl_Obj *keyObj, Tcl_Obj *ivObj) { const EVP_CIPHER *cipher; | | < < < < < < < < < < < | < | < < < < > | < | < | < < | | | < | | | | < < | < < < < > | | | < | | | < | < < < < < < < < < < < < < < < < > > > > | 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 | * No result or error message * *------------------------------------------------------------------- */ int EncryptInitialize(Tcl_Interp *interp, int type, EVP_CIPHER_CTX **ctx, Tcl_Obj *cipherObj, Tcl_Obj *keyObj, Tcl_Obj *ivObj) { const EVP_CIPHER *cipher; char *keyString = NULL, *ivString = NULL; int cipher_len = 0, key_len = 0, iv_len = 0, res, max; unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH]; dprintf("Called"); /* Init buffers */ memset(key, 0, EVP_MAX_KEY_LENGTH); memset(iv, 0, EVP_MAX_IV_LENGTH); /* Get cipher */ cipher = Util_GetCipher(interp, cipherObj, 1); if (cipher == NULL) { return TCL_ERROR; } /* Get key - Only support internally defined cipher lengths. Custom ciphers can be up to size_t bytes. */ max = EVP_CIPHER_key_length(cipher); keyString = (const void *) Util_GetKey(interp, keyObj, &key_len, "key", max, FALSE); if (keyString != NULL) { memcpy((void *) key, (const void *) keyString, (size_t) key_len); } else if (keyObj != NULL) { return TCL_ERROR; } /* Get IV */ max = EVP_CIPHER_iv_length(cipher); ivString = (const void *) Util_GetIV(interp, ivObj, &iv_len, max, FALSE); if (ivString != NULL) { memcpy((void *) iv, (const void *) ivString, (size_t) iv_len); } else if (ivObj != NULL) { return TCL_ERROR; } /* Create context */ if((*ctx = EVP_CIPHER_CTX_new()) == NULL) { Tcl_AppendResult(interp, "Memory allocation error", (char *) NULL); return TCL_ERROR; } /* Initialize the operation. Need appropriate key and iv size. */ if (type == TYPE_ENCRYPT) { res = EVP_EncryptInit_ex(*ctx, cipher, NULL, key, iv); } else { res = EVP_DecryptInit_ex(*ctx, cipher, NULL, key, iv); } if(!res) { Tcl_AppendResult(interp, "Initialize failed: ", REASON(), NULL); return TCL_ERROR; } /* Erase buffers */ memset(key, 0, EVP_MAX_KEY_LENGTH); memset(iv, 0, EVP_MAX_IV_LENGTH); return TCL_OK; } /* *------------------------------------------------------------------- * * EncryptUpdate -- |
︙ | ︙ |
Modified generic/tlsInt.h from [0f4281d913] to [8236808b5c].
︙ | ︙ | |||
196 197 198 199 200 201 202 203 204 205 206 | int Tls_WaitForConnect(State *statePtr, int *errorCodePtr, int handshakeFailureIsPermanent); int Tls_DigestCommands(Tcl_Interp *interp); int Tls_EncryptCommands(Tcl_Interp *interp); int Tls_InfoCommands(Tcl_Interp *interp); int Tls_KeyCommands(Tcl_Interp *interp); BIO *BIO_new_tcl(State* statePtr, int flags); #define PTR2INT(x) ((int) ((intptr_t) (x))) #endif /* _TLSINT_H */ | > > > > > > > > > > | 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 | int Tls_WaitForConnect(State *statePtr, int *errorCodePtr, int handshakeFailureIsPermanent); int Tls_DigestCommands(Tcl_Interp *interp); int Tls_EncryptCommands(Tcl_Interp *interp); int Tls_InfoCommands(Tcl_Interp *interp); int Tls_KeyCommands(Tcl_Interp *interp); BIO *BIO_new_tcl(State* statePtr, int flags); EVP_CIPHER *Util_GetCipher(Tcl_Interp *interp, Tcl_Obj *cipherObj, int no_null); EVP_MD *Util_GetDigest(Tcl_Interp *interp, Tcl_Obj *digestObj, int no_null); unsigned char *Util_GetIV(Tcl_Interp *interp, Tcl_Obj *ivObj, int *len, int max, int no_null); unsigned char *Util_GetKey(Tcl_Interp *interp, Tcl_Obj *keyObj, int *len, char *name, int max, int no_null); unsigned char *Util_GetSalt(Tcl_Interp *interp, Tcl_Obj *saltObj, int *len, int max, int no_null); int Util_GetInt(Tcl_Interp *interp, Tcl_Obj *dataObj, int *value, char *name, int min, int max); #if OPENSSL_VERSION_NUMBER >= 0x30000000L EVP_MAC *Util_GetMAC(Tcl_Interp *interp, Tcl_Obj *MacObj, int no_null); #endif #define PTR2INT(x) ((int) ((intptr_t) (x))) #endif /* _TLSINT_H */ |
Added generic/tlsKDF.c version [2e942636f4].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 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 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 | /* * Key Derivation Function (KDF) Module * * Provides commands to derive keys. * * Copyright (C) 2023 Brian O'Hagan * */ #include "tlsInt.h" #include "tclOpts.h" #include <openssl/evp.h> #include <openssl/kdf.h> /*******************************************************************/ /* Options for KDF commands */ static const char *command_opts [] = { "-cipher", "-digest", "-hash", "-info", "-iterations", "-key", "-length", "-password", "-salt", "-size", "-N", "-n", "-r", "-p", NULL}; enum _command_opts { _opt_cipher, _opt_digest, _opt_hash, _opt_info, _opt_iter, _opt_key, _opt_length, _opt_password, _opt_salt, _opt_size, _opt_N, _opt_n, _opt_r, _opt_p }; /* *------------------------------------------------------------------- * * KDF_PBKDF2 -- * * PKCS5_PBKDF2_HMAC key derivation function (KDF) specified by PKCS #5. * KDFs include PBKDF2 from RFC 2898/8018 and Scrypt from RFC 7914. * * Returns: * TCL_OK or TCL_ERROR * * Side effects: * Sets result to a list of key and iv values, or an error message * *------------------------------------------------------------------- */ static int KDF_PBKDF2(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { int pass_len = 0, salt_len = 0, fn; int iklen, ivlen, iter = 1; unsigned char *pass = NULL, *salt = NULL; const EVP_MD *md = NULL; const EVP_CIPHER *cipher = NULL; int buf_len = (EVP_MAX_KEY_LENGTH + EVP_MAX_IV_LENGTH)*4, dk_len = buf_len; unsigned char tmpkeyiv[(EVP_MAX_KEY_LENGTH + EVP_MAX_IV_LENGTH)*4]; dprintf("Called"); /* Clear errors */ Tcl_ResetResult(interp); ERR_clear_error(); /* Validate arg count */ if (objc < 3 || objc > 11) { Tcl_WrongNumArgs(interp, 1, objv, "[-cipher cipher | -size length] -digest digest ?-iterations count? ?-password string? ?-salt string?"); return TCL_ERROR; } /* Init buffers */ memset(tmpkeyiv, 0, buf_len); /* Get options */ for (int idx = 1; idx < objc; idx++) { /* Get option */ if (Tcl_GetIndexFromObj(interp, objv[idx], command_opts, "option", 0, &fn) != TCL_OK) { return TCL_ERROR; } /* Validate arg has a value */ if (++idx >= objc) { Tcl_AppendResult(interp, "No value for option \"", command_opts[fn], "\"", NULL); return TCL_ERROR; } switch(fn) { case _opt_cipher: if ((cipher = Util_GetCipher(interp, objv[idx], TRUE)) == NULL) { return TCL_ERROR; } break; case _opt_digest: case _opt_hash: if ((md = Util_GetDigest(interp, objv[idx], TRUE)) == NULL) { return TCL_ERROR; } break; case _opt_iter: if (Util_GetInt(interp, objv[idx], &iter, "iterations", 1, -1) != TCL_OK) { return TCL_ERROR; } break; case _opt_key: case _opt_password: pass = Util_GetKey(interp, objv[idx], &pass_len, command_opts[fn], 0, FALSE); break; case _opt_salt: GET_OPT_BYTE_ARRAY(objv[idx], salt, &salt_len); break; case _opt_length: case _opt_size: if (Util_GetInt(interp, objv[idx], &dk_len, command_opts[fn], 1, buf_len) != TCL_OK) { return TCL_ERROR; } break; } } /* Validate options */ if (md == NULL) { Tcl_AppendResult(interp, "no digest", NULL); return TCL_ERROR; } /* Set output type sizes */ if (cipher == NULL) { if (dk_len > buf_len) dk_len = buf_len; iklen = dk_len; ivlen = 0; } else { iklen = EVP_CIPHER_key_length(cipher); ivlen = EVP_CIPHER_iv_length(cipher); dk_len = iklen+ivlen; } /* Derive key */ if (!PKCS5_PBKDF2_HMAC(pass, pass_len, salt, salt_len, iter, md, dk_len, tmpkeyiv)) { Tcl_AppendResult(interp, "Key derivation failed: ", REASON(), NULL); return TCL_ERROR; } /* Set result to key and iv */ if (cipher == NULL) { Tcl_SetObjResult(interp, Tcl_NewByteArrayObj(tmpkeyiv, dk_len)); } else { Tcl_Obj *resultObj = Tcl_NewListObj(0, NULL); LAPPEND_BARRAY(interp, resultObj, "key", tmpkeyiv, iklen); LAPPEND_BARRAY(interp, resultObj, "iv", tmpkeyiv+iklen, ivlen); Tcl_SetObjResult(interp, resultObj); } /* Clear data */ memset(tmpkeyiv, 0, buf_len); return TCL_OK; clientData = clientData; } /* *------------------------------------------------------------------- * * KDF_HKDF -- * * HMAC-based Extract-and-Expand Key Derivation Function (HKDF). * See RFC 5869. * * Returns: * TCL_OK or TCL_ERROR * * Side effects: * Sets result to a key of specified length, or an error message * *------------------------------------------------------------------- */ static int KDF_HKDF(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { EVP_PKEY_CTX *pctx = NULL; const EVP_MD *md = NULL; unsigned char *salt = NULL, *key = NULL, *info = NULL, *out = NULL; int salt_len = 0, key_len = 0, info_len = 0, res = TCL_OK, fn; int dk_len = EVP_MAX_KEY_LENGTH + EVP_MAX_IV_LENGTH; size_t out_len; Tcl_Obj *resultObj; dprintf("Called"); /* Clear errors */ Tcl_ResetResult(interp); ERR_clear_error(); /* Validate arg count */ if (objc < 5 || objc > 11) { Tcl_WrongNumArgs(interp, 1, objv, "-digest digest -key string ?-info string? ?-salt string? ?-size derived_length?"); return TCL_ERROR; } /* Get options */ for (int idx = 1; idx < objc; idx++) { /* Get option */ if (Tcl_GetIndexFromObj(interp, objv[idx], command_opts, "option", 0, &fn) != TCL_OK) { return TCL_ERROR; } /* Validate arg has a value */ if (++idx >= objc) { Tcl_AppendResult(interp, "No value for option \"", command_opts[fn], "\"", NULL); return TCL_ERROR; } switch(fn) { case _opt_digest: case _opt_hash: if ((md = Util_GetDigest(interp, objv[idx], TRUE)) == NULL) { goto error; } break; case _opt_info: /* Max 1024/2048 */ GET_OPT_BYTE_ARRAY(objv[idx], info, &info_len); break; case _opt_key: case _opt_password: if ((key = Util_GetKey(interp, objv[idx], &key_len, command_opts[fn], 0, 1)) == NULL) { goto error; } break; case _opt_salt: GET_OPT_BYTE_ARRAY(objv[idx], salt, &salt_len); break; case _opt_length: case _opt_size: if (Util_GetInt(interp, objv[idx], &dk_len, command_opts[fn], 1, 0) != TCL_OK) { goto error; } break; } } if (md == NULL) { Tcl_AppendResult(interp, "no digest", NULL); goto error; } if (key == NULL) { Tcl_AppendResult(interp, "no key", NULL); goto error; } /* Create context */ pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL); if (pctx == NULL) { Tcl_AppendResult(interp, "Memory allocation error", NULL); goto error; } if (EVP_PKEY_derive_init(pctx) < 1) { Tcl_AppendResult(interp, "Initialize failed: ", REASON(), NULL); goto error; } /* Set config parameters */ if (EVP_PKEY_CTX_set_hkdf_md(pctx, md) < 1) { Tcl_AppendResult(interp, "Set digest failed: ", REASON(), NULL); goto error; } if (EVP_PKEY_CTX_set1_hkdf_key(pctx, key, key_len) < 1) { Tcl_AppendResult(interp, "Set key failed: ", REASON(), NULL); goto error; } if (salt != NULL && EVP_PKEY_CTX_set1_hkdf_salt(pctx, salt, salt_len) < 1) { Tcl_AppendResult(interp, "Set salt failed: ", REASON(), NULL); goto error; } if (info != NULL && EVP_PKEY_CTX_add1_hkdf_info(pctx, info, info_len) < 1) { Tcl_AppendResult(interp, "Set info failed: ", REASON(), NULL); goto error; } /* Get buffer */ resultObj = Tcl_NewObj(); if ((out = Tcl_SetByteArrayLength(resultObj, dk_len)) == NULL) { Tcl_AppendResult(interp, "Memory allocation error", (char *) NULL); goto error; } out_len = (size_t) dk_len; /* Derive key */ if (EVP_PKEY_derive(pctx, out, &out_len) > 0) { /* Shrink buffer to actual size */ Tcl_SetByteArrayLength(resultObj, (int) out_len); Tcl_SetObjResult(interp, resultObj); res = TCL_OK; goto done; } else { Tcl_AppendResult(interp, "Key derivation failed: ", REASON(), NULL); Tcl_DecrRefCount(resultObj); } error: res = TCL_ERROR; done: if (pctx != NULL) { EVP_PKEY_CTX_free(pctx); } return res; } /* *------------------------------------------------------------------- * * KDF_Scrypt -- * * HMAC-based Extract-and-Expand Key Derivation Function (HKDF). * See RFC 5869 and RFC 7914. * * Returns: * TCL_OK or TCL_ERROR * * Side effects: * Sets result to a list of key and iv values, or an error message * *------------------------------------------------------------------- */ static int KDF_Scrypt(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]) { EVP_PKEY_CTX *pctx = NULL; unsigned char *salt = NULL, *pass = NULL, *out = NULL; int salt_len = 0, pass_len = 0, dk_len = 64, res = TCL_OK, fn; uint64_t N = 0, p = 0, r = 0, maxmem = 0; size_t out_len; Tcl_Obj *resultObj; dprintf("Called"); /* Clear errors */ Tcl_ResetResult(interp); ERR_clear_error(); /* Validate arg count */ if (objc < 5 || objc > 13) { Tcl_WrongNumArgs(interp, 1, objv, "-password string -salt string ?-N costParameter? ?-r blockSize? ?-p parallelization? ?-size derived_length?"); return TCL_ERROR; } /* Get options */ for (int idx = 1; idx < objc; idx++) { /* Get option */ if (Tcl_GetIndexFromObj(interp, objv[idx], command_opts, "option", 0, &fn) != TCL_OK) { return TCL_ERROR; } /* Validate arg has a value */ if (++idx >= objc) { Tcl_AppendResult(interp, "No value for option \"", command_opts[fn], "\"", (char *) NULL); return TCL_ERROR; } switch(fn) { case _opt_key: case _opt_password: GET_OPT_BYTE_ARRAY(objv[idx], pass, &pass_len); break; case _opt_salt: GET_OPT_BYTE_ARRAY(objv[idx], salt, &salt_len); break; case _opt_length: case _opt_size: if (Util_GetInt(interp, objv[idx], &dk_len, command_opts[fn], 1, 0) != TCL_OK) { goto error; } break; case _opt_N: case _opt_n: GET_OPT_WIDE(objv[idx], &N); break; case _opt_r: GET_OPT_WIDE(objv[idx], &r); break; case _opt_p: GET_OPT_WIDE(objv[idx], &p); break; } } if (pass == NULL) { Tcl_AppendResult(interp, "no password", (char *) NULL); return TCL_ERROR; } if (salt == NULL) { Tcl_AppendResult(interp, "no salt", (char *) NULL); return TCL_ERROR; } /* Create context */ pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_SCRYPT, NULL); if (pctx == NULL) { Tcl_AppendResult(interp, "Memory allocation error", (char *) NULL); goto error; } if (EVP_PKEY_derive_init(pctx) < 1) { Tcl_AppendResult(interp, "Initialize failed: ", REASON(), NULL); goto error; } /* Set config parameters */ if (EVP_PKEY_CTX_set1_pbe_pass(pctx, pass, pass_len) < 1) { Tcl_AppendResult(interp, "Set key failed: ", REASON(), NULL); goto error; } if (EVP_PKEY_CTX_set1_scrypt_salt(pctx, salt, salt_len) < 1) { Tcl_AppendResult(interp, "Set salt failed: ", REASON(), NULL); goto error; } if (N != 0 && EVP_PKEY_CTX_set_scrypt_N(pctx, N) < 1) { Tcl_AppendResult(interp, "Set cost parameter (N) failed: ", REASON(), NULL); goto error; } if (r != 0 && EVP_PKEY_CTX_set_scrypt_r(pctx, r) < 1) { Tcl_AppendResult(interp, "Set lock size parameter (r) failed: ", REASON(), NULL); goto error; } if (p != 0 && EVP_PKEY_CTX_set_scrypt_p(pctx, p) < 1) { Tcl_AppendResult(interp, "Set Parallelization parameter (p) failed: ", REASON(), NULL); goto error; } if (maxmem != 0 && EVP_PKEY_CTX_set_scrypt_maxmem_bytes(pctx, maxmem) < 1) { Tcl_AppendResult(interp, "Set max memory failed: ", REASON(), NULL); goto error; } /* Get buffer */ resultObj = Tcl_NewObj(); if ((out = Tcl_SetByteArrayLength(resultObj, dk_len)) == NULL) { Tcl_AppendResult(interp, "Memory allocation error", (char *) NULL); goto error; } out_len = (size_t) dk_len; /* Derive key */ if (EVP_PKEY_derive(pctx, out, &out_len) > 0) { /* Shrink buffer to actual size */ Tcl_SetByteArrayLength(resultObj, (int) out_len); Tcl_SetObjResult(interp, resultObj); goto done; } else { Tcl_AppendResult(interp, "Key derivation failed: ", REASON(), NULL); Tcl_DecrRefCount(resultObj); } error: res = TCL_ERROR; done: if (pctx != NULL) { EVP_PKEY_CTX_free(pctx); } return res; } /* *------------------------------------------------------------------- * * Tls_KeyCommands -- * * Create key commands * * Returns: * TCL_OK or TCL_ERROR * * Side effects: * Creates commands * *------------------------------------------------------------------- */ int Tls_KeyCommands(Tcl_Interp *interp) { Tcl_CreateObjCommand(interp, "tls::hkdf", KDF_HKDF, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL); Tcl_CreateObjCommand(interp, "tls::pbkdf2", KDF_PBKDF2, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL); Tcl_CreateObjCommand(interp, "tls::scrypt", KDF_Scrypt, (ClientData) 0, (Tcl_CmdDeleteProc *) NULL); return TCL_OK; } |
Deleted generic/tlsKey.c version [9456e8167e].
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Added generic/tlsUtil.c version [8f89b37f61].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 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 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 | /* * Cryptographic Utility Functions * * Provides commands to derive keys. * * Copyright (C) 2023 Brian O'Hagan * */ #include "tlsInt.h" #include "tclOpts.h" #include <openssl/evp.h> /* *------------------------------------------------------------------- * * Util_GetCipher -- * * Get symmetric cipher from TclObj * * Returns: * Pointer to type or NULL * * Side effects: * None * *------------------------------------------------------------------- */ EVP_CIPHER *Util_GetCipher(Tcl_Interp *interp, Tcl_Obj *cipherObj, int no_null) { EVP_CIPHER *cipher = NULL; char *name = NULL; if (cipherObj != NULL) { name = Tcl_GetStringFromObj(cipherObj, NULL); #if OPENSSL_VERSION_NUMBER < 0x30000000L cipher = EVP_get_cipherbyname(name); #else cipher = EVP_CIPHER_fetch(NULL, name, NULL); #endif if (cipher == NULL) { Tcl_AppendResult(interp, "invalid cipher \"", name, "\"", (char *) NULL); } } else if (no_null) { Tcl_AppendResult(interp, "no cipher", (char *) NULL); } return cipher; } /* *------------------------------------------------------------------- * * Util_GetDigest -- * * Get message digest (MD) or hash from TclObj * * Returns: * Pointer to type or NULL * * Side effects: * None * *------------------------------------------------------------------- */ EVP_MD *Util_GetDigest(Tcl_Interp *interp, Tcl_Obj *digestObj, int no_null) { EVP_MD *md = NULL; char *name = NULL; if (digestObj != NULL) { name = Tcl_GetStringFromObj(digestObj, NULL); #if OPENSSL_VERSION_NUMBER < 0x30000000L md = EVP_get_digestbyname(name); #else md = EVP_MD_fetch(NULL, name, NULL); #endif if (md == NULL) { Tcl_AppendResult(interp, "invalid digest \"", name, "\"", (char *) NULL); } } else if (no_null) { Tcl_AppendResult(interp, "no digest", (char *) NULL); } return md; } /* *------------------------------------------------------------------- * * Util_GetIV -- * * Get encryption initialization vector or seed from TclObj * * Returns: * Pointer to type or NULL, and size * * Side effects: * None * *------------------------------------------------------------------- */ unsigned char *Util_GetIV(Tcl_Interp *interp, Tcl_Obj *ivObj, int *len, int max, int no_null) { unsigned char *iv = NULL; *len = 0; if (ivObj != NULL) { iv = Tcl_GetByteArrayFromObj(ivObj, len); } else if (no_null) { Tcl_AppendResult(interp, "no initialization vector (IV)", (char *) NULL); return NULL; } if (max > 0 && *len > max) { Tcl_SetObjResult(interp, Tcl_ObjPrintf("IV too long. Must be <= %d bytes", max)); return NULL; } return iv; } /* *------------------------------------------------------------------- * * Util_GetKey -- * * Get encryption key or password from TclObj * * Returns: * Pointer to type or NULL, and size * * Side effects: * None * *------------------------------------------------------------------- */ unsigned char *Util_GetKey(Tcl_Interp *interp, Tcl_Obj *keyObj, int *len, char *name, int max, int no_null) { unsigned char *key = NULL; *len = 0; if (keyObj != NULL) { key = Tcl_GetByteArrayFromObj(keyObj, len); } else if (no_null) { Tcl_AppendResult(interp, "no ", name, (char *) NULL); return NULL; } if (max > 0 && *len > max) { Tcl_SetObjResult(interp, Tcl_ObjPrintf("Invalid %s length. Must be <= %d bytes", name, max)); return NULL; } return key; } /* *------------------------------------------------------------------- * * Util_GetMAC -- * * Get Message Authentication Code (MAC) from TclObj * * Returns: * Pointer to type or NULL * * Side effects: * None * *------------------------------------------------------------------- */ #if OPENSSL_VERSION_NUMBER >= 0x30000000L EVP_MAC *Util_GetMAC(Tcl_Interp *interp, Tcl_Obj *MacObj, int no_null) { EVP_MAC *mac = NULL; char *name = NULL; if (MacObj != NULL) { name = Tcl_GetStringFromObj(MacObj, NULL); mac = EVP_MAC_fetch(NULL, name, NULL); if (mac == NULL) { Tcl_AppendResult(interp, "invalid MAC \"", name, "\"", (char *) NULL); return NULL; } } else if (no_null) { Tcl_AppendResult(interp, "no MAC", (char *) NULL); } return mac; } #endif /* *------------------------------------------------------------------- * * Util_GetSalt -- * * Get encryption salt from TclObj * * Returns: * Pointer to type or NULL, and size * * Side effects: * None * *------------------------------------------------------------------- */ unsigned char *Util_GetSalt(Tcl_Interp *interp, Tcl_Obj *saltObj, int *len, int max, int no_null) { unsigned char *salt = NULL; *len = 0; if (saltObj != NULL) { salt = Tcl_GetByteArrayFromObj(saltObj, len); } else if (no_null) { Tcl_AppendResult(interp, "no salt", (char *) NULL); return NULL; } if (max > 0 && *len > max) { Tcl_SetObjResult(interp, Tcl_ObjPrintf("Salt too long. Must be <= %d bytes", max)); return NULL; } return salt; } /*******************************************************************/ /* *------------------------------------------------------------------- * * Util_GetInt -- * * Get integer value from TclObj * * Returns: * TCL_OK or TCL_ERROR * * Side effects: * None * *------------------------------------------------------------------- */ int Util_GetInt(Tcl_Interp *interp, Tcl_Obj *dataObj, int *value, char *name, int min, int max) { if (dataObj != NULL) { if (Tcl_GetIntFromObj(interp, dataObj, value) != TCL_OK) { return TCL_ERROR; } } /* Validate range */ if (*value < min) { Tcl_SetObjResult(interp, Tcl_ObjPrintf("invalid value \"%d\" for option \"%s\": must be >= %d", *value, name, min)); return TCL_ERROR; } else if (max > 0 && *value > max) { Tcl_SetObjResult(interp, Tcl_ObjPrintf("invalid value \"%d\" for option \"%s\": must be <= %d", *value, name, max)); return TCL_ERROR; } return TCL_OK; } |
Modified win/makefile.vc from [ac05bd257a] to [40a127f356].
︙ | ︙ | |||
27 28 29 30 31 32 33 | # defined by rules for object files. PRJ_OBJS = $(TMP_DIR)\tls.obj \ $(TMP_DIR)\tlsBIO.obj \ $(TMP_DIR)\tlsDigest.obj \ $(TMP_DIR)\tlsEncrypt.obj \ $(TMP_DIR)\tlsInfo.obj \ $(TMP_DIR)\tlsIO.obj \ | | > | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | # defined by rules for object files. PRJ_OBJS = $(TMP_DIR)\tls.obj \ $(TMP_DIR)\tlsBIO.obj \ $(TMP_DIR)\tlsDigest.obj \ $(TMP_DIR)\tlsEncrypt.obj \ $(TMP_DIR)\tlsInfo.obj \ $(TMP_DIR)\tlsIO.obj \ $(TMP_DIR)\tlsKDF.obj \ $(TMP_DIR)\tlsUtil.obj \ $(TMP_DIR)\tlsX509.obj # Define any additional project include flags # SSL_INSTALL_FOLDER = with the OpenSSL installation folder following. PRJ_INCLUDES = -I"$(SSL_INSTALL_FOLDER)\include" -I"$(OPENSSL_INSTALL_DIR)\include" # Define any additional compiler flags that might be required for the project |
︙ | ︙ |