diff options
| author | Adam Langley <agl@google.com> | 2015-03-30 14:49:51 -0700 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-04-07 17:50:50 -0700 |
| commit | d059297112922cabb0c674840589be8db821fd9a (patch) | |
| tree | 9c2045d28ec1c8594090f38bc32e9f523dc6c68d /cipher-ctr.c | |
| parent | f5c67b478bef9992de9e9ec91ce10af4f6205e0d (diff) | |
| download | platform_external_openssh-d059297112922cabb0c674840589be8db821fd9a.tar.gz platform_external_openssh-d059297112922cabb0c674840589be8db821fd9a.tar.bz2 platform_external_openssh-d059297112922cabb0c674840589be8db821fd9a.zip | |
external/openssh: update to 6.8p1.
In preparation for some updates to external/openssh to make it work with
BoringSSL, this change updates the code to a recent version. The current
version (5.9p1) is coming up on four years old now.
* Confirmed that f5c67b478bef9992de9e9ec91ce10af4f6205e0d matches
OpenSSH 5.9p1 exactly (save for the removal of the scard
subdirectory).
* Downloaded openssh-6.8p1.tar.gz (SHA256:
3ff64ce73ee124480b5bf767b9830d7d3c03bbcb6abe716b78f0192c37ce160e)
and verified with PGP signature. (I've verified Damien's key in
person previously.)
* Applied changes between f5c67b478bef9992de9e9ec91ce10af4f6205e0d and
OpenSSH 5.9p1 to 6.8p1 and updated the build as best I can. The
ugliest change is probably the duplication of umac.c to umac128.c
because Android conditionally compiles that file twice. See the
comment in those files.
Change-Id: I63cb07a8118afb5a377f116087a0882914cea486
Diffstat (limited to 'cipher-ctr.c')
| -rw-r--r-- | cipher-ctr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cipher-ctr.c b/cipher-ctr.c index 04975b4b..32771f28 100644 --- a/cipher-ctr.c +++ b/cipher-ctr.c @@ -16,6 +16,7 @@ */ #include "includes.h" +#if defined(WITH_OPENSSL) && !defined(OPENSSL_HAVE_EVPCTR) #include <sys/types.h> #include <stdarg.h> @@ -33,9 +34,6 @@ #include <openssl/aes.h> #endif -const EVP_CIPHER *evp_aes_128_ctr(void); -void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, size_t); - struct ssh_aes_ctr_ctx { AES_KEY aes_ctx; @@ -106,7 +104,7 @@ ssh_aes_ctr_cleanup(EVP_CIPHER_CTX *ctx) if ((c = EVP_CIPHER_CTX_get_app_data(ctx)) != NULL) { memset(c, 0, sizeof(*c)); - xfree(c); + free(c); EVP_CIPHER_CTX_set_app_data(ctx, NULL); } return (1); @@ -144,3 +142,5 @@ evp_aes_128_ctr(void) #endif return (&aes_ctr); } + +#endif /* defined(WITH_OPENSSL) && !defined(OPENSSL_HAVE_EVPCTR) */ |