View | Details | Raw Unified | Return to bug 2907
Collapse All | Expand All

(-)a/auth.h (+2 lines)
Lines 30-36 Link Here
30 

          30
          

        

        

          31
          
#include <signal.h>

          31
          
#include <signal.h>

        

        

          32
          

          32
          

        

            

              
              
              33
              
#ifdef WITH_OPENSSL

            

        

          33
          
#include <openssl/rsa.h>

          34
          
#include <openssl/rsa.h>

        

            

              
              
              35
              
#endif

            

        

          34
          

          36
          

        

        

          35
          
#ifdef HAVE_LOGIN_CAP

          37
          
#ifdef HAVE_LOGIN_CAP

        

        

          36
          
#include <login_cap.h>

          38
          
#include <login_cap.h>

        



(-)a/cipher.c
      (+2 lines)




  

    
      
            Lines 55-61
          
      
      
        Link Here
      
    
  

        

          55
          
struct sshcipher_ctx {

          55
          
struct sshcipher_ctx {

        

        

          56
          
	int	plaintext;

          56
          
	int	plaintext;

        

        

          57
          
	int	encrypt;

          57
          
	int	encrypt;

        

            

              
              
              58
              
#ifdef WITH_OPENSSL

            

        

          58
          
	EVP_CIPHER_CTX *evp;

          59
          
	EVP_CIPHER_CTX *evp;

        

            

              
              
              60
              
#endif

            

        

          59
          
	struct chachapoly_ctx cp_ctx; /* XXX union with evp? */

          61
          
	struct chachapoly_ctx cp_ctx; /* XXX union with evp? */

        

        

          60
          
	struct aesctr_ctx ac_ctx; /* XXX union with evp? */

          62
          
	struct aesctr_ctx ac_ctx; /* XXX union with evp? */

        

        

          61
          
	const struct sshcipher *cipher;

          63
          
	const struct sshcipher *cipher;

        



(-)a/cipher.h
      (+2 lines)




  

    
      
            Lines 38-44
          
      
      
        Link Here
      
    
  

        

          38
          
#define CIPHER_H

          38
          
#define CIPHER_H

        

        

          39
          

          39
          

        

        

          40
          
#include <sys/types.h>

          40
          
#include <sys/types.h>

        

            

              
              
              41
              
#ifdef WITH_OPENSSL

            

        

          41
          
#include <openssl/evp.h>

          42
          
#include <openssl/evp.h>

        

            

              
              
              43
              
#endif

            

        

          42
          
#include "cipher-chachapoly.h"

          44
          
#include "cipher-chachapoly.h"

        

        

          43
          
#include "cipher-aesctr.h"

          45
          
#include "cipher-aesctr.h"

        

        

          44
          

          46
          

        



(-)a/kexc25519.c
      (+2 lines)




  

    
      
            Lines 32-39
          
      
      
        Link Here
      
    
  

        

          32
          
#include <signal.h>

          32
          
#include <signal.h>

        

        

          33
          
#include <string.h>

          33
          
#include <string.h>

        

        

          34
          

          34
          

        

            

              
              
              35
              
#ifdef WITH_OPENSSL

            

        

          35
          
#include <openssl/bn.h>

          36
          
#include <openssl/bn.h>

        

        

          36
          
#include <openssl/evp.h>

          37
          
#include <openssl/evp.h>

        

            

              
              
              38
              
#endif

            

        

          37
          

          39
          

        

        

          38
          
#include "sshbuf.h"

          40
          
#include "sshbuf.h"

        

        

          39
          
#include "ssh2.h"

          41
          
#include "ssh2.h"

        



(-)a/loginrec.c
      (+1 lines)




  

    
      
            Lines 166-171
          
      
      
        Link Here
      
    
  

        

          166
          
#include <string.h>

          166
          
#include <string.h>

        

        

          167
          
#include <time.h>

          167
          
#include <time.h>

        

        

          168
          
#include <unistd.h>

          168
          
#include <unistd.h>

        

            

              
              
              169
              
#include <stdlib.h>

            

        

          169
          

          170
          

        

        

          170
          
#include "xmalloc.h"

          171
          
#include "xmalloc.h"

        

        

          171
          
#include "sshkey.h"

          172
          
#include "sshkey.h"

        



(-)a/monitor_wrap.h
      (+2 lines)




  

    
      
            Lines 40-46
          struct sshauthopt;
      
      
        Link Here
      
    
  

        

          40
          

          40
          

        

        

          41
          
void mm_log_handler(LogLevel, const char *, void *);

          41
          
void mm_log_handler(LogLevel, const char *, void *);

        

        

          42
          
int mm_is_monitor(void);

          42
          
int mm_is_monitor(void);

        

            

              
              
              43
              
#ifdef WITH_OPENSSL

            

        

          43
          
DH *mm_choose_dh(int, int, int);

          44
          
DH *mm_choose_dh(int, int, int);

        

            

              
              
              45
              
#endif

            

        

          44
          
int mm_sshkey_sign(struct sshkey *, u_char **, size_t *, const u_char *, size_t,

          46
          
int mm_sshkey_sign(struct sshkey *, u_char **, size_t *, const u_char *, size_t,

        

        

          45
          
    const char *, u_int compat);

          47
          
    const char *, u_int compat);

        

        

          46
          
void mm_inform_authserv(char *, char *);

          48
          
void mm_inform_authserv(char *, char *);

        



(-)a/myproposal.h
      (+2 lines)




  

    
      
            Lines 24-30
          
      
      
        Link Here
      
    
  

        

          24
          
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

          24
          
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

        

        

          25
          
 */

          25
          
 */

        

        

          26
          

          26
          

        

            

              
              
              27
              
#ifdef WITH_OPENSSL

            

        

          27
          
#include <openssl/opensslv.h>

          28
          
#include <openssl/opensslv.h>

        

            

              
              
              29
              
#endif

            

        

          28
          

          30
          

        

        

          29
          
/* conditional algorithm support */

          31
          
/* conditional algorithm support */

        

        

          30
          

          32
          

        



(-)a/ssh-add.c
      (+2 lines)




  

    
      
            Lines 40-46
          
      
      
        Link Here
      
    
  

        

          40
          
#include <sys/types.h>

          40
          
#include <sys/types.h>

        

        

          41
          
#include <sys/stat.h>

          41
          
#include <sys/stat.h>

        

        

          42
          

          42
          

        

            

              
              
              43
              
#ifdef WITH_OPENSSL

            

        

          43
          
#include <openssl/evp.h>

          44
          
#include <openssl/evp.h>

        

            

              
              
              45
              
#endif

            

        

          44
          
#include "openbsd-compat/openssl-compat.h"

          46
          
#include "openbsd-compat/openssl-compat.h"

        

        

          45
          

          47
          

        

        

          46
          
#include <errno.h>

          48
          
#include <errno.h>

        



(-)a/ssh-keyscan.c
      (+2 lines)




  

    
      
            Lines 19-25
          
      
      
        Link Here
      
    
  

        

          19
          
#include <netinet/in.h>

          19
          
#include <netinet/in.h>

        

        

          20
          
#include <arpa/inet.h>

          20
          
#include <arpa/inet.h>

        

        

          21
          

          21
          

        

            

              
              
              22
              
#ifdef WITH_OPENSSL

            

        

          22
          
#include <openssl/bn.h>

          23
          
#include <openssl/bn.h>

        

            

              
              
              24
              
#endif

            

        

          23
          

          25
          

        

        

          24
          
#include <netdb.h>

          26
          
#include <netdb.h>

        

        

          25
          
#include <errno.h>

          27
          
#include <errno.h>

        



(-)a/sshbuf-getput-crypto.c
      (+3 lines)




  

    
      
            Lines 18-23
          
      
      
        Link Here
      
    
  

        

          18
          
#define SSHBUF_INTERNAL

          18
          
#define SSHBUF_INTERNAL

        

        

          19
          
#include "includes.h"

          19
          
#include "includes.h"

        

        

          20
          

          20
          

        

            

              
              
              21
              
#ifdef WITH_OPENSSL

            

            

              22
              

            

        

          21
          
#include <sys/types.h>

          23
          
#include <sys/types.h>

        

        

          22
          
#include <stdlib.h>

          24
          
#include <stdlib.h>

        

        

          23
          
#include <stdio.h>

          25
          
#include <stdio.h>

        

  

    
      
            Lines 222-224
          sshbuf_put_eckey(struct sshbuf *buf, const EC_KEY *v)
      
      
        Link Here
      
    
  

        

          222
          
}

          224
          
}

        

        

          223
          
#endif /* OPENSSL_HAS_ECC */

          225
          
#endif /* OPENSSL_HAS_ECC */

        

        

          224
          

          226
          

        

            

              
              
              227
              
#endif /* WITH_OPENSSL */

            



(-)a/sshkey.c
      (-1 / +1 lines)




  

    
      
            Lines 27-32
          
      
      
        Link Here
      
    
  

        

          27
          

          27
          

        

        

          28
          
#include "includes.h"

          28
          
#include "includes.h"

        

        

          29
          

          29
          

        

            

              
              
              30
              
#include <time.h>

            

        

          30
          
#include <sys/types.h>

          31
          
#include <sys/types.h>

        

        

          31
          
#include <netinet/in.h>

          32
          
#include <netinet/in.h>

        

        

          32
          

          33
          

        

            

              33
              
- 

              
              
            






  

  Return to bug 2907