summaryrefslogtreecommitdiffstats
path: root/crypto/objects
diff options
context:
space:
mode:
authorTim Hudson <tjh@openssl.org>2014-12-28 12:48:40 +1000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:23:04 +0000
commit6977c7e2baf291278aee7632f1a68581b7c4d1f9 (patch)
treeae6c4def1c5f7f4a3c4cb9bb7e63ec0ebf27b7f7 /crypto/objects
parent43257b9f51de749262258668c77c2f0f99d7a15b (diff)
mark all block comments that need format preserving so that
indent will not alter them when reformatting comments (cherry picked from commit 1d97c8435171a7af575f73c526d79e1ef0ee5960) 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 Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/objects')
-rw-r--r--crypto/objects/objects.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/objects/objects.h b/crypto/objects/objects.h
index bd0ee52feb..42d2457295 100644
--- a/crypto/objects/objects.h
+++ b/crypto/objects/objects.h
@@ -639,7 +639,8 @@
#define NID_ripemd160WithRSA 119
#define OBJ_ripemd160WithRSA 1L,3L,36L,3L,3L,1L,2L
-/* Taken from rfc2040
+/*-
+ * Taken from rfc2040
* RC5_CBC_Parameters ::= SEQUENCE {
* version INTEGER (v1_0(16)),
* rounds INTEGER (8..127),
@@ -1028,7 +1029,7 @@ const void * OBJ_bsearch_ex_(const void *key,const void *base,int num,
#define DECLARE_OBJ_BSEARCH_GLOBAL_CMP_FN(type1, type2, nm) \
type2 * OBJ_bsearch_##nm(type1 *key, type2 const *base, int num)
-/*
+/*-
* Unsolved problem: if a type is actually a pointer type, like
* nid_triple is, then its impossible to get a const where you need
* it. Consider: