summaryrefslogtreecommitdiffstats
path: root/crypto/pem/pem.h
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-05 11:30:03 +0000
committerMatt Caswell <matt@openssl.org>2015-01-22 09:31:48 +0000
commit83975c80bbc3e84cc605e0491707a6517f5dd346 (patch)
tree3292eadddefc6fd0b0ce848c1fe285a3bbe32cb6 /crypto/pem/pem.h
parent323d39e87f86bc4524881942aafc7539532aefff (diff)
Re-align some comments after running the reformat script.OpenSSL_1_0_2-post-reformat
This should be a one off operation (subsequent invokation of the script should not move them) This commit is for the 1.0.2 changes Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/pem/pem.h')
-rw-r--r--crypto/pem/pem.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h
index 49175ffe1f..1d7232cb59 100644
--- a/crypto/pem/pem.h
+++ b/crypto/pem/pem.h
@@ -174,18 +174,17 @@ typedef struct pem_ctx_st {
struct {
int cipher;
/*-
- unused, and wrong size
- unsigned char iv[8]; */
+ unused, and wrong size
+ unsigned char iv[8]; */
} DEK_info;
PEM_USER *originator;
int num_recipient;
PEM_USER **recipient;
-
- /*-
- XXX(ben): don#t think this is used!
- STACK *x509_chain; / * certificate chain */
+/*-
+ XXX(ben): don#t think this is used!
+ STACK *x509_chain; / * certificate chain */
EVP_MD *md; /* signature type */
int md_enc; /* is the md encrypted or not? */
@@ -195,9 +194,9 @@ typedef struct pem_ctx_st {
EVP_CIPHER *dec; /* date encryption cipher */
int key_len; /* key length */
unsigned char *key; /* key */
- /*-
- unused, and wrong size
- unsigned char iv[8]; */
+ /*-
+ unused, and wrong size
+ unsigned char iv[8]; */
int data_enc; /* is the data encrypted */
int data_len;