diff options
author | Damien Miller <djm@mindrot.org> | 2003-11-21 23:48:55 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-11-21 23:48:55 +1100 |
commit | a8e06cef35c205e1aa562513c6d034a10c8c9a6d (patch) | |
tree | cf8bdb4466f553088c020b9179cabd6eaf196075 /cipher-ctr.c | |
parent | 8c5e91c03fdd2693f0635f8b2a9904bffc94ce16 (diff) |
- djm@cvs.openbsd.org 2003/11/21 11:57:03
[everything]
unexpand and delete whitespace at EOL; ok markus@
(done locally and RCS IDs synced)
Diffstat (limited to 'cipher-ctr.c')
-rw-r--r-- | cipher-ctr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cipher-ctr.c b/cipher-ctr.c index 4f0814b22..a9ddb8a66 100644 --- a/cipher-ctr.c +++ b/cipher-ctr.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
15 | */ | 15 | */ |
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$OpenBSD: cipher-ctr.c,v 1.2 2003/06/17 18:14:23 markus Exp $"); | 17 | RCSID("$OpenBSD: cipher-ctr.c,v 1.3 2003/11/21 11:57:03 djm Exp $"); |
18 | 18 | ||
19 | #include <openssl/evp.h> | 19 | #include <openssl/evp.h> |
20 | 20 | ||
@@ -94,7 +94,7 @@ ssh_aes_ctr_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv, | |||
94 | EVP_CIPHER_CTX_set_app_data(ctx, c); | 94 | EVP_CIPHER_CTX_set_app_data(ctx, c); |
95 | } | 95 | } |
96 | if (key != NULL) | 96 | if (key != NULL) |
97 | AES_set_encrypt_key(key, ctx->key_len * 8, &c->aes_ctx); | 97 | AES_set_encrypt_key(key, ctx->key_len * 8, &c->aes_ctx); |
98 | if (iv != NULL) | 98 | if (iv != NULL) |
99 | memcpy(c->aes_counter, iv, AES_BLOCK_SIZE); | 99 | memcpy(c->aes_counter, iv, AES_BLOCK_SIZE); |
100 | return (1); | 100 | return (1); |