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

Further comment amendments to preserve formatting prior to source reformat

Browse Source 
(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5)

Conflicts:
	crypto/x509v3/pcy_tree.c

Conflicts:
	apps/apps.c
	ssl/ssltest.c

Conflicts:
	apps/apps.c
	crypto/ec/ec2_oct.c
	crypto/ec/ecp_nistp224.c
	crypto/ec/ecp_nistp256.c
	crypto/ec/ecp_nistp521.c
	ssl/s3_cbc.c
	ssl/ssl_sess.c
	ssl/t1_lib.c

Conflicts:
	crypto/bio/b_sock.c
	crypto/pem/pem.h
	crypto/x509/x509_vfy.c
	crypto/x509v3/pcy_tree.c
	ssl/s3_both.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
Matt Caswell
2015-01-05 00:34:00 +00:00
parent b558c8d597
commit 564ccc55d6
31 changed files with 70 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ca.c
View File

@@ -627,7 +627,7 @@ bad:
oid_bio=BIO_new_file(p,"r"); oid_bio=BIO_new_file(p,"r");
if (oid_bio == NULL) if (oid_bio == NULL)
{ {
/* /*-
BIO_printf(bio_err,"problems opening %s for extra oid's\n",p); BIO_printf(bio_err,"problems opening %s for extra oid's\n",p);
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
*/ */

3
apps/pkcs7.c
View File

@@ -71,7 +71,8 @@
#undef PROG #undef PROG
#define PROG pkcs7_main #define PROG pkcs7_main
/* -inform arg - input format - default PEM (DER or PEM) /*-
* -inform arg - input format - default PEM (DER or PEM)
* -outform arg - output format - default PEM * -outform arg - output format - default PEM
* -in arg - input file - default stdin * -in arg - input file - default stdin
* -out arg - output file - default stdout * -out arg - output file - default stdout

2
apps/req.c
View File

@@ -605,7 +605,7 @@ bad:
oid_bio=BIO_new_file(p,"r"); oid_bio=BIO_new_file(p,"r");
if (oid_bio == NULL) if (oid_bio == NULL)
{ {
/* /*-
BIO_printf(bio_err,"problems opening %s for extra oid's\n",p); BIO_printf(bio_err,"problems opening %s for extra oid's\n",p);
ERR_print_errors(bio_err); ERR_print_errors(bio_err);
*/ */

2
apps/s_cb.c
View File

@@ -204,7 +204,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
return(0); return(0);
} }
/* /*-
In theory this is no longer needed In theory this is no longer needed
ssl=SSL_new(ctx); ssl=SSL_new(ctx);
x509=SSL_get_certificate(ssl); x509=SSL_get_certificate(ssl);

6
crypto/bio/bf_null.c
View File

@@ -102,9 +102,11 @@ static int nullf_new(BIO *bi)
static int nullf_free(BIO *a) static int nullf_free(BIO *a)
{ {
if (a == NULL) return(0); if (a == NULL) return(0);
/* a->ptr=NULL; /*-
a->ptr=NULL;
a->init=0; a->init=0;
a->flags=0;*/ a->flags=0;
*/
return(1); return(1);
} }

3
crypto/bio/bss_rtcp.c
View File

@@ -56,7 +56,8 @@
* [including the GNU Public Licence.] * [including the GNU Public Licence.]
*/ */
/* Written by David L. Jones <jonesd@kcgl1.eng.ohio-state.edu> /*-
* Written by David L. Jones <jonesd@kcgl1.eng.ohio-state.edu>
* Date: 22-JUL-1996 * Date: 22-JUL-1996
* Revised: 25-SEP-1997 Update for 0.8.1, BIO_CTRL_SET -> BIO_C_SET_FD * Revised: 25-SEP-1997 Update for 0.8.1, BIO_CTRL_SET -> BIO_C_SET_FD
*/ */

3
crypto/bn/bn_ctx.c
View File

@@ -66,7 +66,8 @@
#include "cryptlib.h" #include "cryptlib.h"
#include "bn_lcl.h" #include "bn_lcl.h"
/* TODO list /*-
* TODO list
* *
* 1. Check a bunch of "(words+1)" type hacks in various bignum functions and * 1. Check a bunch of "(words+1)" type hacks in various bignum functions and
* check they can be safely removed. * check they can be safely removed.

3
crypto/des/des_old.c
View File

@@ -1,6 +1,7 @@
/* crypto/des/des_old.c -*- mode:C; c-file-style: "eay" -*- */ /* crypto/des/des_old.c -*- mode:C; c-file-style: "eay" -*- */
/* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING /*-
* WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
* *
* The function names in here are deprecated and are only present to * The function names in here are deprecated and are only present to
* provide an interface compatible with libdes. OpenSSL now provides * provide an interface compatible with libdes. OpenSSL now provides

6
crypto/des/set_key.c
View File

@@ -155,7 +155,8 @@ int DES_is_weak_key(const_DES_cblock *key)
return(0); return(0);
} }
/* NOW DEFINED IN des_local.h /*-
* NOW DEFINED IN des_local.h
* See ecb_encrypt.c for a pseudo description of these macros. * See ecb_encrypt.c for a pseudo description of these macros.
* #define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\ * #define PERM_OP(a,b,t,n,m) ((t)=((((a)>>(n))^(b))&(m)),\
* (b)^=(t),\ * (b)^=(t),\
@@ -325,7 +326,8 @@ int DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule)
} }
} }
/* return 0 if key parity is odd (correct), /*-
* return 0 if key parity is odd (correct),
* return -1 if key parity error, * return -1 if key parity error,
* return -2 if illegal weak key. * return -2 if illegal weak key.
*/ */

6
crypto/ec/ec2_mult.c
View File

@@ -72,7 +72,8 @@
#include "ec_lcl.h" #include "ec_lcl.h"
/* Compute the x-coordinate x/z for the point 2*(x/z) in Montgomery projective /*-
* Compute the x-coordinate x/z for the point 2*(x/z) in Montgomery projective
* coordinates. * coordinates.
* Uses algorithm Mdouble in appendix of * Uses algorithm Mdouble in appendix of
* Lopez, J. and Dahab, R. "Fast multiplication on elliptic curves over * Lopez, J. and Dahab, R. "Fast multiplication on elliptic curves over
@@ -104,7 +105,8 @@ static int gf2m_Mdouble(const EC_GROUP *group, BIGNUM *x, BIGNUM *z, BN_CTX *ctx
return ret; return ret;
} }
/* Compute the x-coordinate x1/z1 for the point (x1/z1)+(x2/x2) in Montgomery /*-
* Compute the x-coordinate x1/z1 for the point (x1/z1)+(x2/x2) in Montgomery
* projective coordinates. * projective coordinates.
* Uses algorithm Madd in appendix of * Uses algorithm Madd in appendix of
* Lopex, J. and Dahab, R. "Fast multiplication on elliptic curves over * Lopex, J. and Dahab, R. "Fast multiplication on elliptic curves over

5
crypto/ec/ecp_smpl.c
View File

@@ -113,13 +113,14 @@ const EC_METHOD *EC_GFp_simple_method(void)
} }
/* Most method functions in this file are designed to work with /*
* Most method functions in this file are designed to work with
* non-trivial representations of field elements if necessary * non-trivial representations of field elements if necessary
* (see ecp_mont.c): while standard modular addition and subtraction * (see ecp_mont.c): while standard modular addition and subtraction
* are used, the field_mul and field_sqr methods will be used for * are used, the field_mul and field_sqr methods will be used for
* multiplication, and field_encode and field_decode (if defined) * multiplication, and field_encode and field_decode (if defined)
* will be used for converting between representations. * will be used for converting between representations.
*
* Functions ec_GFp_simple_points_make_affine() and * Functions ec_GFp_simple_points_make_affine() and
* ec_GFp_simple_point_get_affine_coordinates() specifically assume * ec_GFp_simple_point_get_affine_coordinates() specifically assume
* that if a non-trivial representation is used, it is a Montgomery * that if a non-trivial representation is used, it is a Montgomery

3
crypto/ecdh/ech_ossl.c
View File

@@ -100,7 +100,8 @@ const ECDH_METHOD *ECDH_OpenSSL(void)
} }
/* This implementation is based on the following primitives in the IEEE 1363 standard: /*-
* This implementation is based on the following primitives in the IEEE 1363 standard:
* - ECKAS-DH1 * - ECKAS-DH1
* - ECSVDP-DH * - ECSVDP-DH
* Finally an optional KDF is applied. * Finally an optional KDF is applied.

3
crypto/engine/eng_openssl.c
View File

@@ -207,7 +207,8 @@ IMPLEMENT_DYNAMIC_BIND_FN(bind_fn)
#endif /* ENGINE_DYNAMIC_SUPPORT */ #endif /* ENGINE_DYNAMIC_SUPPORT */
#ifdef TEST_ENG_OPENSSL_RC4 #ifdef TEST_ENG_OPENSSL_RC4
/* This section of code compiles an "alternative implementation" of two modes of /*-
* This section of code compiles an "alternative implementation" of two modes of
* RC4 into this ENGINE. The result is that EVP_CIPHER operation for "rc4" * RC4 into this ENGINE. The result is that EVP_CIPHER operation for "rc4"
* should under normal circumstances go via this support rather than the default * should under normal circumstances go via this support rather than the default
* EVP support. There are other symbols to tweak the testing; * EVP support. There are other symbols to tweak the testing;

2
crypto/md5/md5_locl.h
View File

@@ -93,7 +93,7 @@ void md5_block_data_order (MD5_CTX *c, const void *p,size_t num);
#include "md32_common.h" #include "md32_common.h"
/* /*-
#define F(x,y,z) (((x) & (y)) | ((~(x)) & (z))) #define F(x,y,z) (((x) & (y)) | ((~(x)) & (z)))
#define G(x,y,z) (((x) & (z)) | ((y) & (~(z)))) #define G(x,y,z) (((x) & (z)) | ((y) & (~(z))))
*/ */

3
crypto/objects/objects.h
View File

@@ -604,7 +604,8 @@
#define NID_pbeWithMD5AndCast5_CBC 112 #define NID_pbeWithMD5AndCast5_CBC 112
#define OBJ_pbeWithMD5AndCast5_CBC 1L,2L,840L,113533L,7L,66L,12L #define OBJ_pbeWithMD5AndCast5_CBC 1L,2L,840L,113533L,7L,66L,12L
/* This is one sun will soon be using :-( /*-
* This is one sun will soon be using :-(
* id-dsa-with-sha1 ID ::= { * id-dsa-with-sha1 ID ::= {
* iso(1) member-body(2) us(840) x9-57 (10040) x9cm(4) 3 } * iso(1) member-body(2) us(840) x9-57 (10040) x9cm(4) 3 }
*/ */

3
crypto/ocsp/ocsp_ext.c
View File

@@ -360,7 +360,8 @@ int OCSP_basic_add1_nonce(OCSP_BASICRESP *resp, unsigned char *val, int len)
return ocsp_add1_nonce(&resp->tbsResponseData->responseExtensions, val, len); return ocsp_add1_nonce(&resp->tbsResponseData->responseExtensions, val, len);
} }
/* Check nonce validity in a request and response. /*-
* Check nonce validity in a request and response.
* Return value reflects result: * Return value reflects result:
* 1: nonces present and equal. * 1: nonces present and equal.
* 2: nonces both absent. * 2: nonces both absent.

6
crypto/pem/pem.h
View File

@@ -174,7 +174,8 @@ typedef struct pem_ctx_st
struct { struct {
int cipher; int cipher;
/* unused, and wrong size /*-
unused, and wrong size
unsigned char iv[8]; */ unsigned char iv[8]; */
} DEK_info; } DEK_info;
@@ -197,7 +198,8 @@ typedef struct pem_ctx_st
EVP_CIPHER *dec; /* date encryption cipher */ EVP_CIPHER *dec; /* date encryption cipher */
int key_len; /* key length */ int key_len; /* key length */
unsigned char *key; /* key */ unsigned char *key; /* key */
/* unused, and wrong size /*-
unused, and wrong size
unsigned char iv[8]; */ unsigned char iv[8]; */

3
crypto/rand/rand_win.c
View File

@@ -375,7 +375,8 @@ int RAND_poll(void)
FreeLibrary(user); FreeLibrary(user);
} }
/* Toolhelp32 snapshot: enumerate processes, threads, modules and heap /*-
* Toolhelp32 snapshot: enumerate processes, threads, modules and heap
* http://msdn.microsoft.com/library/psdk/winbase/toolhelp_5pfd.htm * http://msdn.microsoft.com/library/psdk/winbase/toolhelp_5pfd.htm
* (Win 9x and 2000 only, not available on NT) * (Win 9x and 2000 only, not available on NT)
* *

3
crypto/rc2/rc2_ecb.c
View File

@@ -62,7 +62,8 @@
const char RC2_version[]="RC2" OPENSSL_VERSION_PTEXT; const char RC2_version[]="RC2" OPENSSL_VERSION_PTEXT;
/* RC2 as implemented frm a posting from /*-
* RC2 as implemented frm a posting from
* Newsgroups: sci.crypt * Newsgroups: sci.crypt
* Sender: pgut01@cs.auckland.ac.nz (Peter Gutmann) * Sender: pgut01@cs.auckland.ac.nz (Peter Gutmann)
* Subject: Specification for Ron Rivests Cipher No.2 * Subject: Specification for Ron Rivests Cipher No.2

3
crypto/stack/stack.c
View File

@@ -56,7 +56,8 @@
* [including the GNU Public Licence.] * [including the GNU Public Licence.]
*/ */
/* Code for stacks /*-
* Code for stacks
* Author - Eric Young v 1.0 * Author - Eric Young v 1.0
* 1.2 eay 12-Mar-97 - Modified sk_find so that it _DOES_ return the * 1.2 eay 12-Mar-97 - Modified sk_find so that it _DOES_ return the
* lowest index for the searched item. * lowest index for the searched item.

7
crypto/threads/mttest.c
View File

@@ -863,7 +863,7 @@ void solaris_locking_callback(int mode, int type, char *file, int line)
(type&CRYPTO_READ)?"r":"w",file,line); (type&CRYPTO_READ)?"r":"w",file,line);
#endif #endif
/* /*-
if (CRYPTO_LOCK_SSL_CERT == type) if (CRYPTO_LOCK_SSL_CERT == type)
fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n", fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n",
CRYPTO_thread_id(), CRYPTO_thread_id(),
@@ -871,7 +871,8 @@ void solaris_locking_callback(int mode, int type, char *file, int line)
*/ */
if (mode & CRYPTO_LOCK) if (mode & CRYPTO_LOCK)
{ {
/* if (mode & CRYPTO_READ) /*-
if (mode & CRYPTO_READ)
rw_rdlock(&(lock_cs[type])); rw_rdlock(&(lock_cs[type]));
else else
rw_wrlock(&(lock_cs[type])); */ rw_wrlock(&(lock_cs[type])); */
@@ -1067,7 +1068,7 @@ void pthreads_locking_callback(int mode, int type, char *file,
(mode&CRYPTO_LOCK)?"l":"u", (mode&CRYPTO_LOCK)?"l":"u",
(type&CRYPTO_READ)?"r":"w",file,line); (type&CRYPTO_READ)?"r":"w",file,line);
#endif #endif
/* /*-
if (CRYPTO_LOCK_SSL_CERT == type) if (CRYPTO_LOCK_SSL_CERT == type)
fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n", fprintf(stderr,"(t,m,f,l) %ld %d %s %d\n",
CRYPTO_thread_id(), CRYPTO_thread_id(),

3
crypto/threads/th-lock.c
View File

@@ -97,7 +97,8 @@ static unsigned long irix_thread_id(void );
static unsigned long solaris_thread_id(void ); static unsigned long solaris_thread_id(void );
static unsigned long pthreads_thread_id(void ); static unsigned long pthreads_thread_id(void );
/* usage: /*-
* usage:
* CRYPTO_thread_setup(); * CRYPTO_thread_setup();
* application code * application code
* CRYPTO_thread_cleanup(); * CRYPTO_thread_cleanup();

3
crypto/ui/ui_openssl.c
View File

@@ -56,7 +56,8 @@
* *
*/ */
/* The lowest level part of this file was previously in crypto/des/read_pwd.c, /*-
* The lowest level part of this file was previously in crypto/des/read_pwd.c,
* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved. * All rights reserved.
* *

3
crypto/x509v3/pcy_tree.c
View File

@@ -62,7 +62,8 @@
#include "pcy_int.h" #include "pcy_int.h"
/* Initialize policy tree. Return values: /*-
* Initialize policy tree. Return values:
* 0 Some internal error occured. * 0 Some internal error occured.
* -1 Inconsistent or invalid extensions in certificates. * -1 Inconsistent or invalid extensions in certificates.
* 1 Tree initialized OK. * 1 Tree initialized OK.

3
crypto/x509v3/v3_lib.c
View File

@@ -170,7 +170,8 @@ void *X509V3_EXT_d2i(X509_EXTENSION *ext)
return method->d2i(NULL, &p, ext->value->length); return method->d2i(NULL, &p, ext->value->length);
} }
/* Get critical flag and decoded version of extension from a NID. /*-
* Get critical flag and decoded version of extension from a NID.
* The "idx" variable returns the last found extension and can * The "idx" variable returns the last found extension and can
* be used to retrieve multiple extensions of the same NID. * be used to retrieve multiple extensions of the same NID.
* However multiple extensions with the same NID is usually * However multiple extensions with the same NID is usually

2
crypto/x509v3/v3_pku.c
View File

@@ -97,7 +97,7 @@ static int i2r_PKEY_USAGE_PERIOD(X509V3_EXT_METHOD *method,
return 1; return 1;
} }
/* /*-
static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(method, ctx, values) static PKEY_USAGE_PERIOD *v2i_PKEY_USAGE_PERIOD(method, ctx, values)
X509V3_EXT_METHOD *method; X509V3_EXT_METHOD *method;
X509V3_CTX *ctx; X509V3_CTX *ctx;

3
engines/e_sureware.c
View File

@@ -1,4 +1,5 @@
/* Written by Corinne Dive-Reclus(cdive@baltimore.com) /*-
* Written by Corinne Dive-Reclus(cdive@baltimore.com)
* *
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without

3
ssl/kssl.c
View File

@@ -906,7 +906,8 @@ size_t *populate_cksumlens(void)
return cklens; return cklens;
} }
/* Return pointer to start of real authenticator within authenticator, or /*-
* Return pointer to start of real authenticator within authenticator, or
* return NULL on error. * return NULL on error.
* Decrypted authenticator looks like this: * Decrypted authenticator looks like this:
* [0 or 8 byte confounder] [4-24 byte checksum] [real authent'r] * [0 or 8 byte confounder] [4-24 byte checksum] [real authent'r]

3
ssl/ssl_lib.c
View File

@@ -1533,7 +1533,8 @@ SSL_CTX *SSL_CTX_new(SSL_METHOD *meth)
ret->quiet_shutdown=0; ret->quiet_shutdown=0;
/* ret->cipher=NULL;*/ /* ret->cipher=NULL;*/
/* ret->s2->challenge=NULL; /*-
ret->s2->challenge=NULL;
ret->master_key=NULL; ret->master_key=NULL;
ret->key_arg=NULL; ret->key_arg=NULL;
ret->s2->conn_id=NULL; */ ret->s2->conn_id=NULL; */

6
ssl/ssltest.c
View File

@@ -1411,7 +1411,8 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
if (SSL_in_init(s_ssl)) if (SSL_in_init(s_ssl))
printf("server waiting in SSL_accept - %s\n", printf("server waiting in SSL_accept - %s\n",
SSL_state_string_long(s_ssl)); SSL_state_string_long(s_ssl));
/* else if (s_write) /*-
else if (s_write)
printf("server:SSL_write()\n"); printf("server:SSL_write()\n");
else else
printf("server:SSL_read()\n"); */ printf("server:SSL_read()\n"); */
@@ -1422,7 +1423,8 @@ int doit(SSL *s_ssl, SSL *c_ssl, long count)
if (SSL_in_init(c_ssl)) if (SSL_in_init(c_ssl))
printf("client waiting in SSL_connect - %s\n", printf("client waiting in SSL_connect - %s\n",
SSL_state_string_long(c_ssl)); SSL_state_string_long(c_ssl));
/* else if (c_write) /*-
else if (c_write)
printf("client:SSL_write()\n"); printf("client:SSL_write()\n");
else else
printf("client:SSL_read()\n"); */ printf("client:SSL_read()\n"); */

3
ssl/t1_enc.c
View File

@@ -528,7 +528,8 @@ err:
return(0); return(0);
} }
/* tls1_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively. /*-
* tls1_enc encrypts/decrypts the record in |s->wrec| / |s->rrec|, respectively.
* *
* Returns: * Returns:
* 0: (in non-constant time) if the record is publically invalid (i.e. too * 0: (in non-constant time) if the record is publically invalid (i.e. too