diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-05 00:34:00 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-01-22 09:48:59 +0000 |
| commit | 564ccc55d6463e485f885a8c2192121ea8fe6adf (patch) | |
| tree | de073a7f21239041a5b23820a91515e87abb89f2 /crypto/pem | |
| parent | b558c8d59782dab2809a1530cbbcd9f38785302b (diff) | |
Further comment amendments to preserve formatting prior to source reformat
(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5)
Conflicts:
crypto/x509v3/pcy_tree.c
Conflicts:
apps/apps.c
ssl/ssltest.c
Conflicts:
apps/apps.c
crypto/ec/ec2_oct.c
crypto/ec/ecp_nistp224.c
crypto/ec/ecp_nistp256.c
crypto/ec/ecp_nistp521.c
ssl/s3_cbc.c
ssl/ssl_sess.c
ssl/t1_lib.c
Conflicts:
crypto/bio/b_sock.c
crypto/pem/pem.h
crypto/x509/x509_vfy.c
crypto/x509v3/pcy_tree.c
ssl/s3_both.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/pem')
| -rw-r--r-- | crypto/pem/pem.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h index 6c193f1cbf..f1e9c65d36 100644 --- a/crypto/pem/pem.h +++ b/crypto/pem/pem.h @@ -174,7 +174,8 @@ typedef struct pem_ctx_st struct { int cipher; - /* unused, and wrong size + /*- + unused, and wrong size unsigned char iv[8]; */ } DEK_info; @@ -197,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]; */ |