summaryrefslogtreecommitdiffstats
path: root/ssl.c
diff options
context:
space:
mode:
authorAdriaan de Jong <dejong@fox-it.com>2011-06-23 09:05:12 +0200
committerDavid Sommerseth <davids@redhat.com>2011-10-19 22:05:45 +0200
commitb5738e5b858274785eff30edb4748e3f641e0b1c (patch)
treeb57615baf8f06373141794c491aa0ac0cd48e93c /ssl.c
parent6825182b8137c036afcdc0e48397c0ea5ffc2404 (diff)
downloadopenvpn-b5738e5b858274785eff30edb4748e3f641e0b1c.tar.gz
openvpn-b5738e5b858274785eff30edb4748e3f641e0b1c.tar.xz
openvpn-b5738e5b858274785eff30edb4748e3f641e0b1c.zip
Refactored OpenSSL-specific constants
[David S: Fixed a few whitespace errors before merging] Signed-off-by: Adriaan de Jong <dejong@fox-it.com> Acked-by: David Sommerseth <davids@redhat.com> Signed-off-by: David Sommerseth <davids@redhat.com>
Diffstat (limited to 'ssl.c')
-rw-r--r--ssl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ssl.c b/ssl.c
index b78cab7..c9af94b 100644
--- a/ssl.c
+++ b/ssl.c
@@ -3893,13 +3893,13 @@ generate_key_expansion (struct key_ctx_bi *key,
init_key_ctx (&key->encrypt,
&key2.keys[(int)server],
key_type,
- DO_ENCRYPT,
+ OPENVPN_OP_ENCRYPT,
"Data Channel Encrypt");
init_key_ctx (&key->decrypt,
&key2.keys[1-(int)server],
key_type,
- DO_DECRYPT,
+ OPENVPN_OP_DECRYPT,
"Data Channel Decrypt");
ret = true;
@@ -4267,7 +4267,7 @@ key_method_1_write (struct buffer *buf, struct tls_session *session)
}
init_key_ctx (&ks->key.encrypt, &key, &session->opt->key_type,
- DO_ENCRYPT, "Data Channel Encrypt");
+ OPENVPN_OP_ENCRYPT, "Data Channel Encrypt");
CLEAR (key);
/* send local options string */
@@ -4483,7 +4483,7 @@ key_method_1_read (struct buffer *buf, struct tls_session *session)
buf_clear (buf);
init_key_ctx (&ks->key.decrypt, &key, &session->opt->key_type,
- DO_DECRYPT, "Data Channel Decrypt");
+ OPENVPN_OP_DECRYPT, "Data Channel Decrypt");
CLEAR (key);
ks->authenticated = true;
return true;