mark all block comments that need format preserving so that
indent will not alter them when reformatting comments
(cherry picked from commit 1d97c84351
)
Conflicts:
crypto/bn/bn_lcl.h
crypto/bn/bn_prime.c
crypto/engine/eng_all.c
crypto/rc4/rc4_utl.c
crypto/sha/sha.h
ssl/kssl.c
ssl/t1_lib.c
Conflicts:
crypto/rc4/rc4_enc.c
crypto/x509v3/v3_scts.c
crypto/x509v3/v3nametest.c
ssl/d1_both.c
ssl/s3_srvr.c
ssl/ssl.h
ssl/ssl_locl.h
ssl/ssltest.c
ssl/t1_lib.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
This commit is contained in:
@@ -312,7 +312,7 @@ extern "C" {
|
||||
|
||||
#define SSL_TXT_ALL "ALL"
|
||||
|
||||
/*
|
||||
/*-
|
||||
* COMPLEMENTOF* definitions. These identifiers are used to (de-select)
|
||||
* ciphers normally not being used.
|
||||
* Example: "RC4" will activate all ciphers using RC4 including ciphers
|
||||
@@ -442,7 +442,8 @@ struct ssl_method_st
|
||||
long (*ssl_ctx_callback_ctrl)(SSL_CTX *s, int cb_id, void (*fp)(void));
|
||||
};
|
||||
|
||||
/* Lets make this into an ASN.1 type structure as follows
|
||||
/*-
|
||||
* Lets make this into an ASN.1 type structure as follows
|
||||
* SSL_SESSION_ID ::= SEQUENCE {
|
||||
* version INTEGER, -- structure version number
|
||||
* SSLversion INTEGER, -- SSL version number
|
||||
|
Reference in New Issue
Block a user