X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fopenssl%2Fcipher.c;h=5d9bebcdb68e9b4f8d1cbfac05c4c1768fa31655;hb=c7752ca73e582d63412e7f40984cff2fca02c22f;hp=7f73cb1bbc22e53f7b34025521783986e2b190d7;hpb=5b07039b0712bee0f19749d63116a10fb08a2d8b;p=tinc

diff --git a/src/openssl/cipher.c b/src/openssl/cipher.c
index 7f73cb1b..5d9bebcd 100644
--- a/src/openssl/cipher.c
+++ b/src/openssl/cipher.c
@@ -81,6 +81,9 @@ void cipher_close(cipher_t *cipher) {
 }
 
 size_t cipher_keylength(const cipher_t *cipher) {
+	if(!cipher || !cipher->cipher)
+		return 0;
+
 	return cipher->cipher->key_len + cipher->cipher->block_size;
 }
 
@@ -168,7 +171,7 @@ bool cipher_counter_xor(cipher_t *cipher, const void *indata, size_t inlen, void
 					break;
 		}
 
-		*out++ = *in++ ^ cipher->counter->counter[cipher->counter->n++];
+		*out++ = *in++ ^ cipher->counter->block[cipher->counter->n++];
 
 		if(cipher->counter->n >= cipher->cipher->block_size)
 			cipher->counter->n = 0;
@@ -221,7 +224,10 @@ bool cipher_decrypt(cipher_t *cipher, const void *indata, size_t inlen, void *ou
 }
 
 int cipher_get_nid(const cipher_t *cipher) {
-	return cipher->cipher ? cipher->cipher->nid : 0;
+	if(!cipher || !cipher->cipher)
+		return 0;
+
+	return cipher->cipher->nid;
 }
 
 bool cipher_active(const cipher_t *cipher) {