generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-align some comments after running the reformat script.

Browse Source 
This should be a one off operation (subsequent invokation of the
script should not move them)

This commit is for the 1.0.0 changes

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell 2015-01-05 11:30:03 +00:00
parent 4bc9913844
commit 3d7a9aca8c
68 changed files with 1100 additions and 1099 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/gendh.c
View File

@ -122,7 +122,7 @@ int MAIN(int argc, char **argv)
outfile = *(++argv); outfile = *(++argv);
} else if (strcmp(*argv, "-2") == 0) } else if (strcmp(*argv, "-2") == 0)
g = 2; g = 2;
/*- else if (strcmp(*argv,"-3") == 0) /*- else if (strcmp(*argv,"-3") == 0)
g=3; */ g=3; */
else if (strcmp(*argv, "-5") == 0) else if (strcmp(*argv, "-5") == 0)
g = 5; g = 5;

4
crypto/des/destest.c
View File

@ -404,13 +404,13 @@ int main(int argc, char *argv[])
DES_ENCRYPT); DES_ENCRYPT);
DES_ede3_cbcm_encrypt(&cbc_data[16], &cbc_out[16], i - 16, &ks, &ks2, DES_ede3_cbcm_encrypt(&cbc_data[16], &cbc_out[16], i - 16, &ks, &ks2,
&ks3, &iv3, &iv2, DES_ENCRYPT); &ks3, &iv3, &iv2, DES_ENCRYPT);
/*- if (memcmp(cbc_out,cbc3_ok, /*- if (memcmp(cbc_out,cbc3_ok,
(unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0) (unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)
{ {
printf("des_ede3_cbc_encrypt encrypt error\n"); printf("des_ede3_cbc_encrypt encrypt error\n");
err=1; err=1;
} }
*/ */
memcpy(iv3, cbc_iv, sizeof(cbc_iv)); memcpy(iv3, cbc_iv, sizeof(cbc_iv));
memset(iv2, '\0', sizeof iv2); memset(iv2, '\0', sizeof iv2);
DES_ede3_cbcm_encrypt(cbc_out, cbc_in, i, &ks, &ks2, &ks3, &iv3, &iv2, DES_ede3_cbcm_encrypt(cbc_out, cbc_in, i, &ks, &ks2, &ks3, &iv3, &iv2,

2
crypto/pem/pem.h
View File

@ -182,7 +182,7 @@ typedef struct pem_ctx_st {
int num_recipient; int num_recipient;
PEM_USER **recipient; PEM_USER **recipient;
/*- /*-
XXX(ben): don#t think this is used! XXX(ben): don#t think this is used!
STACK *x509_chain; / * certificate chain */ STACK *x509_chain; / * certificate chain */
EVP_MD *md; /* signature type */ EVP_MD *md; /* signature type */

2
crypto/threads/mttest.c
View File

@ -373,7 +373,7 @@ int ndoit(SSL_CTX *ssl_ctx[2])
CRYPTO_thread_id(),i, CRYPTO_thread_id(),i,
ssl_ctx[0]->references, ssl_ctx[0]->references,
ssl_ctx[1]->references); */ ssl_ctx[1]->references); */
/* pthread_delay_np(&tm); */ /* pthread_delay_np(&tm); */
ret = doit(ctx); ret = doit(ctx);
if (ret != 0) { if (ret != 0) {

10
demos/engines/zencod/hw_zencod.h
View File

@ -106,14 +106,14 @@ extern "C" {
/* /*
* Functions for Digest (MD5, SHA1) stuff * Functions for Digest (MD5, SHA1) stuff
*/ */
/* output : output data buffer */ /* output : output data buffer */
/* input : input data buffer */ /* input : input data buffer */
/* algo : hash algorithm, MD5 or SHA1 */ /* algo : hash algorithm, MD5 or SHA1 */
/*- /*-
* typedef int t_zencod_hash ( KEY *output, const KEY *input, int algo ) ; * typedef int t_zencod_hash ( KEY *output, const KEY *input, int algo ) ;
* typedef int t_zencod_sha_hash ( KEY *output, const KEY *input, int algo ) ; * typedef int t_zencod_sha_hash ( KEY *output, const KEY *input, int algo ) ;
*/ */
/* For now separate this stuff that mad it easier to test */ /* For now separate this stuff that mad it easier to test */
typedef int t_zencod_md5_init(ZEN_MD_DATA *data); typedef int t_zencod_md5_init(ZEN_MD_DATA *data);
typedef int t_zencod_md5_update(ZEN_MD_DATA *data, const KEY * input); typedef int t_zencod_md5_update(ZEN_MD_DATA *data, const KEY * input);
typedef int t_zencod_md5_do_final(ZEN_MD_DATA *data, KEY * output); typedef int t_zencod_md5_do_final(ZEN_MD_DATA *data, KEY * output);

3
ssl/s3_enc.c
View File

@ -732,7 +732,8 @@ int n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
* *
* With SHA-1 (the largest hash speced for SSLv3) the hash size * With SHA-1 (the largest hash speced for SSLv3) the hash size
* goes up 4, but npad goes down by 8, resulting in a smaller * goes up 4, but npad goes down by 8, resulting in a smaller
* total size. */ * total size.
*/
unsigned char header[75]; unsigned char header[75];
unsigned j = 0; unsigned j = 0;
memcpy(header + j, mac_sec, md_size); memcpy(header + j, mac_sec, md_size);