summaryrefslogtreecommitdiffstats
path: root/crypto/pem
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-05 00:34:00 +0000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:23:50 +0000
commite19d4a99b8f25456dfab7086af57f3f208cdfed6 (patch)
treecd7931e89476c762982afdc5585aa942ad0a4f0b /crypto/pem
parent6977c7e2baf291278aee7632f1a68581b7c4d1f9 (diff)
Further comment amendments to preserve formatting prior to source reformat
(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5) Conflicts: crypto/x509v3/pcy_tree.c Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/pem')
-rw-r--r--crypto/pem/pem.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h
index 7a76e47571..1037b3f61f 100644
--- a/crypto/pem/pem.h
+++ b/crypto/pem/pem.h
@@ -176,7 +176,8 @@ typedef struct pem_ctx_st
struct {
int cipher;
- /* unused, and wrong size
+ /*-
+ unused, and wrong size
unsigned char iv[8]; */
} DEK_info;
@@ -185,7 +186,8 @@ typedef struct pem_ctx_st
int num_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 */
EVP_MD *md; /* signature type */
@@ -196,7 +198,8 @@ typedef struct pem_ctx_st
EVP_CIPHER *dec; /* date encryption cipher */
int key_len; /* key length */
unsigned char *key; /* key */
- /* unused, and wrong size
+ /*-
+ unused, and wrong size
unsigned char iv[8]; */