Mercurial > vim

comparison src/sha256.c @ 18812:d34ec6fe207d v8.1.2394

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2394: using old C style comments Commit: https://github.com/vim/vim/commit/63d9e730f726341bf41ee4f4b829253cb9879110 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Dec 5 21:10:38 2019 +0100 patch 8.1.2394: using old C style comments Problem: Using old C style comments. Solution: Use // comments where appropriate.
author Bram Moolenaar <Bram@vim.org>
date Thu, 05 Dec 2019 21:15:04 +0100
parents 27b9a84395b5
children c1d1639b52dd
comparison
equal deleted inserted replaced
18811:65b77e62ec07 18812:d34ec6fe207d
258 PUT_UINT32(ctx->state[4], digest, 16); 258 PUT_UINT32(ctx->state[4], digest, 16);
259 PUT_UINT32(ctx->state[5], digest, 20); 259 PUT_UINT32(ctx->state[5], digest, 20);
260 PUT_UINT32(ctx->state[6], digest, 24); 260 PUT_UINT32(ctx->state[6], digest, 24);
261 PUT_UINT32(ctx->state[7], digest, 28); 261 PUT_UINT32(ctx->state[7], digest, 28);
262 } 262 }
263 #endif /* FEAT_CRYPT || FEAT_PERSISTENT_UNDO */ 263 #endif // FEAT_CRYPT || FEAT_PERSISTENT_UNDO
264 264
265 #if defined(FEAT_CRYPT) || defined(PROTO) 265 #if defined(FEAT_CRYPT) || defined(PROTO)
266 /* 266 /*
267 * Returns hex digest of "buf[buf_len]" in a static array. 267 * Returns hex digest of "buf[buf_len]" in a static array.
268 * if "salt" is not NULL also do "salt[salt_len]". 268 * if "salt" is not NULL also do "salt[salt_len]".
299 sha256_key( 299 sha256_key(
300 char_u *buf, 300 char_u *buf,
301 char_u *salt, 301 char_u *salt,
302 int salt_len) 302 int salt_len)
303 { 303 {
304 /* No passwd means don't encrypt */ 304 // No passwd means don't encrypt
305 if (buf == NULL || *buf == NUL) 305 if (buf == NULL || *buf == NUL)
306 return (char_u *)""; 306 return (char_u *)"";
307 307
308 return sha256_bytes(buf, (int)STRLEN(buf), salt, salt_len); 308 return sha256_bytes(buf, (int)STRLEN(buf), salt, salt_len);
309 } 309 }
368 } 368 }
369 if (memcmp(output, sha_self_test_vector[i], 64)) 369 if (memcmp(output, sha_self_test_vector[i], 64))
370 { 370 {
371 failures++; 371 failures++;
372 output[sizeof(output) - 1] = '\0'; 372 output[sizeof(output) - 1] = '\0';
373 /* printf("sha256_self_test %d failed %s\n", i, output); */ 373 // printf("sha256_self_test %d failed %s\n", i, output);
374 } 374 }
375 } 375 }
376 return failures > 0 ? FAIL : OK; 376 return failures > 0 ? FAIL : OK;
377 } 377 }
378 378
380 get_some_time(void) 380 get_some_time(void)
381 { 381 {
382 # ifdef HAVE_GETTIMEOFDAY 382 # ifdef HAVE_GETTIMEOFDAY
383 struct timeval tv; 383 struct timeval tv;
384 384
385 /* Using usec makes it less predictable. */ 385 // Using usec makes it less predictable.
386 gettimeofday(&tv, NULL); 386 gettimeofday(&tv, NULL);
387 return (unsigned int)(tv.tv_sec + tv.tv_usec); 387 return (unsigned int)(tv.tv_sec + tv.tv_usec);
388 # else 388 # else
389 return (unsigned int)time(NULL); 389 return (unsigned int)time(NULL);
390 # endif 390 # endif
412 random_data[i] = (char_u)((get_some_time() ^ rand()) & 0xff); 412 random_data[i] = (char_u)((get_some_time() ^ rand()) & 0xff);
413 sha256_start(&ctx); 413 sha256_start(&ctx);
414 sha256_update(&ctx, (char_u *)random_data, sizeof(random_data)); 414 sha256_update(&ctx, (char_u *)random_data, sizeof(random_data));
415 sha256_finish(&ctx, sha256sum); 415 sha256_finish(&ctx, sha256sum);
416 416
417 /* put first block into header. */ 417 // put first block into header.
418 for (i = 0; i < header_len; i++) 418 for (i = 0; i < header_len; i++)
419 header[i] = sha256sum[i % sizeof(sha256sum)]; 419 header[i] = sha256sum[i % sizeof(sha256sum)];
420 420
421 /* put remaining block into salt. */ 421 // put remaining block into salt.
422 if (salt != NULL) 422 if (salt != NULL)
423 for (i = 0; i < salt_len; i++) 423 for (i = 0; i < salt_len; i++)
424 salt[i] = sha256sum[(i + header_len) % sizeof(sha256sum)]; 424 salt[i] = sha256sum[(i + header_len) % sizeof(sha256sum)];
425 } 425 }
426 426
427 #endif /* FEAT_CRYPT */ 427 #endif // FEAT_CRYPT