2 files changed, 16 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index fe00d03ca..da8a14114 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20140527
+ - (djm) [cipher.c] Fix merge botch.
+
 20140522
  - (djm) [Makefile.in] typo in path
 
diff --git a/cipher.c b/cipher.c
index 0ea073f55..5569d2455 100644
--- a/cipher.c
+++ b/cipher.c
@@ -553,7 +553,12 @@ cipher_get_keyiv(CipherContext *cc, u_char *iv, u_int len)
                         ssh_aes_ctr_iv(&cc->evp, 0, iv, len);
                 else
 #endif /* OPENSSL_HAVE_EVPCTR */
-                memcpy(iv, cc->evp.iv, len);
+                if (cipher_authlen(c)) {
+                        if (!EVP_CIPHER_CTX_ctrl(&cc->evp, EVP_CTRL_GCM_IV_GEN,
+                            len, iv))
+                                fatal("%s: EVP_CTRL_GCM_IV_GEN", __func__);
+                } else
+                        memcpy(iv, cc->evp.iv, len);
                 break;
 #endif /* WITH_OPENSSL */
 #ifdef WITH_SSH1
@@ -597,7 +602,13 @@ cipher_set_keyiv(CipherContext *cc, u_char *iv)
                         ssh_aes_ctr_iv(&cc->evp, 1, iv, evplen);
                 else
 #endif /* OPENSSL_HAVE_EVPCTR */
-                memcpy(cc->evp.iv, iv, evplen);
+                if (cipher_authlen(c)) {
+                        if (!EVP_CIPHER_CTX_ctrl(&cc->evp,
+                            EVP_CTRL_GCM_SET_IV_FIXED, -1, iv))
+                                fatal("%s: EVP_CTRL_GCM_SET_IV_FIXED failed",
+                                    __func__);
+                        } else
+                                memcpy(cc->evp.iv, iv, evplen);
                 break;
 #endif /* WITH_OPENSSL */
 #ifdef WITH_SSH1