diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2012-08-02 17:38:04 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2012-08-02 17:40:14 +0300 |
| commit | 2c2467e1eb63bbdf7b332d27bdadd2f2e7a61077 (patch) | |
| tree | 8ba421c5c55d2ef840679c6ade16fb45698201a2 /main/openssh/openssh-hmac-accel.diff | |
| parent | ce9d2dea5b5d0da317b8417f8d916b269fd8696f (diff) | |
| download | aports-2c2467e1eb63bbdf7b332d27bdadd2f2e7a61077.tar.bz2 aports-2c2467e1eb63bbdf7b332d27bdadd2f2e7a61077.tar.xz | |
main/openssh: upgrade to 6.0p1
* also add support for hmac oneshot mode (requires patched openssl;
we have these patches in Alpine)
* rebase hpn patches
* remove obsolete patch (upstreamed)
Diffstat (limited to 'main/openssh/openssh-hmac-accel.diff')
| -rw-r--r-- | main/openssh/openssh-hmac-accel.diff | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/main/openssh/openssh-hmac-accel.diff b/main/openssh/openssh-hmac-accel.diff new file mode 100644 index 0000000000..91140263cb --- /dev/null +++ b/main/openssh/openssh-hmac-accel.diff @@ -0,0 +1,10 @@ +--- a/mac.c ++++ b/mac.c +@@ -142,6 +142,7 @@ + /* reset HMAC context */ + HMAC_Init(&mac->evp_ctx, NULL, 0, NULL); + HMAC_Update(&mac->evp_ctx, b, sizeof(b)); ++ HMAC_CTX_set_flags(&mac->evp_ctx, EVP_MD_CTX_FLAG_ONESHOT); + HMAC_Update(&mac->evp_ctx, data, datalen); + HMAC_Final(&mac->evp_ctx, m, NULL); + break; |