aboutsummaryrefslogtreecommitdiff
path: root/crypto/evp
diff options
context:
space:
mode:
authorTim Hudson <tjh@openssl.org>2014-12-28 12:48:40 +1000
committerMatt Caswell <matt@openssl.org>2014-12-30 22:10:26 +0000
commit1d97c8435171a7af575f73c526d79e1ef0ee5960 (patch)
tree99405d276f1713c41130162ac64f6b01c95a0751 /crypto/evp
parentaa8a9266f91ce05068c5bf7eab44263c99d366f3 (diff)
downloadopenssl-1d97c8435171a7af575f73c526d79e1ef0ee5960.zip
openssl-1d97c8435171a7af575f73c526d79e1ef0ee5960.tar.gz
openssl-1d97c8435171a7af575f73c526d79e1ef0ee5960.tar.bz2
mark all block comments that need format preserving so that
indent will not alter them when reformatting comments Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'crypto/evp')
-rw-r--r--crypto/evp/bio_enc.c2
-rw-r--r--crypto/evp/bio_md.c2
-rw-r--r--crypto/evp/bio_ok.c2
-rw-r--r--crypto/evp/encode.c9
-rw-r--r--crypto/evp/evp.h2
-rw-r--r--crypto/evp/evp_locl.h2
-rw-r--r--crypto/evp/p_seal.c2
7 files changed, 12 insertions, 9 deletions
diff --git a/crypto/evp/bio_enc.c b/crypto/evp/bio_enc.c
index 3cf75f0..2ceb802 100644
--- a/crypto/evp/bio_enc.c
+++ b/crypto/evp/bio_enc.c
@@ -396,7 +396,7 @@ static long enc_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
return(ret);
}
-/*
+/*-
void BIO_set_cipher_ctx(b,c)
BIO *b;
EVP_CIPHER_ctx *c;
diff --git a/crypto/evp/bio_md.c b/crypto/evp/bio_md.c
index 144fdfd..6190156 100644
--- a/crypto/evp/bio_md.c
+++ b/crypto/evp/bio_md.c
@@ -264,7 +264,7 @@ static int md_gets(BIO *bp, char *buf, int size)
return((int)ret);
}
-/*
+/*-
static int md_puts(bp,str)
BIO *bp;
char *str;
diff --git a/crypto/evp/bio_ok.c b/crypto/evp/bio_ok.c
index ad8cad8..973439a 100644
--- a/crypto/evp/bio_ok.c
+++ b/crypto/evp/bio_ok.c
@@ -56,7 +56,7 @@
* [including the GNU Public Licence.]
*/
-/*
+/*-
From: Arne Ansper <arne@cyber.ee>
Why BIO_f_reliable?
diff --git a/crypto/evp/encode.c b/crypto/evp/encode.c
index a4f7674..e612fd1 100644
--- a/crypto/evp/encode.c
+++ b/crypto/evp/encode.c
@@ -74,7 +74,8 @@
#define conv_ascii2bin(a) (data_ascii2bin[os_toascii[a]&0x7f])
#endif
-/* 64 char lines
+/*-
+ * 64 char lines
* pad input with 0
* left over chars are set to =
* 1 byte => xx==
@@ -88,7 +89,8 @@
static const unsigned char data_bin2ascii[65]="ABCDEFGHIJKLMNOPQRSTUVWXYZ\
abcdefghijklmnopqrstuvwxyz0123456789+/";
-/* 0xF0 is a EOLN
+/*-
+ * 0xF0 is a EOLN
* 0xF1 is ignore but next needs to be 0xF0 (for \r\n processing).
* 0xF2 is EOF
* 0xE0 is ignore at start of line.
@@ -228,7 +230,8 @@ void EVP_DecodeInit(EVP_ENCODE_CTX *ctx)
ctx->expect_nl=0;
}
-/* -1 for error
+/*-
+ * -1 for error
* 0 for last line
* 1 for full line
*/
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index 757b796..7290c10 100644
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -75,7 +75,7 @@
#include <openssl/bio.h>
#endif
-/*
+/*-
#define EVP_RC2_KEY_SIZE 16
#define EVP_RC4_KEY_SIZE 16
#define EVP_BLOWFISH_KEY_SIZE 16
diff --git a/crypto/evp/evp_locl.h b/crypto/evp/evp_locl.h
index 94162d6..cff2942 100644
--- a/crypto/evp/evp_locl.h
+++ b/crypto/evp/evp_locl.h
@@ -185,7 +185,7 @@ BLOCK_CIPHER_def_ecb(cname, kstruct, nid, block_size, key_len, flags, \
init_key, cleanup, set_asn1, get_asn1, ctrl)
-/*
+/*-
#define BLOCK_CIPHER_defs(cname, kstruct, \
nid, block_size, key_len, iv_len, flags,\
init_key, cleanup, set_asn1, get_asn1, ctrl)\
diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c
index e5919b0..6658302 100644
--- a/crypto/evp/p_seal.c
+++ b/crypto/evp/p_seal.c
@@ -94,7 +94,7 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char **ek
return(npubk);
}
-/* MACRO
+/*- MACRO
void EVP_SealUpdate(ctx,out,outl,in,inl)
EVP_CIPHER_CTX *ctx;
unsigned char *out;