crypto: Revert some changes in contributed code.

diff --git a/crypto/openssh/ssh-pkcs11-helper.c b/crypto/openssh/ssh-pkcs11-helper.c
index 62fc433..cd33515 100644 (file)
--- a/crypto/openssh/ssh-pkcs11-helper.c
+++ b/crypto/openssh/ssh-pkcs11-helper.c
@@ -168,8 +168,7 @@ process_sign(void)
 {
        u_char *blob, *data, *signature = NULL;
        u_int blen, dlen, slen = 0;
-       int ok = -1, ret;
-       int __unused flags;
+       int ok = -1, flags, ret;
        Key *key, *found;
        Buffer msg;
 

diff --git a/crypto/openssh/ssh.c b/crypto/openssh/ssh.c
index a217cde..ee124c1 100644 (file)
--- a/crypto/openssh/ssh.c
+++ b/crypto/openssh/ssh.c
@@ -1327,7 +1327,7 @@ ssh_session2_setup(int id, int success, void *arg)
 {
        extern char **environ;
        const char *display;
-       int __unused interactive = tty_flag;
+       int interactive = tty_flag;
 
        if (!success)
                return; /* No need for error message, channels code sens one */