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

(-)v6eval/Makefile (-4 lines)
Lines 22-31 USE_OPENSSL= yes Link Here
22 

          22
          

        

        

          23
          
.include <bsd.port.pre.mk>

          23
          
.include <bsd.port.pre.mk>

        

        

          24
          

          24
          

        

            

              25
              
.if ${OSVERSION} >= 700019

              
              
            

            

              26
              
BROKEN=		does not compile with OpenSSL 0.9.8b

            

            

              27
              
.endif

            

            

              28
              

            

        

          29
          
post-install:

          25
          
post-install:

        

        

          30
          
	@${SED} -e 's#@LOCALBASE@#${LOCALBASE}#' ${PKGMESSAGE}

          26
          
	@${SED} -e 's#@LOCALBASE@#${LOCALBASE}#' ${PKGMESSAGE}

        

        

          31
          

          27
          

        



(-)v6eval/files/patch-Bpfilter.h
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- lib/pkt/Bpfilter.h	2001-10-05 20:41:19.000000000 +0900

            

            

              2
              
+++ lib/pkt/Bpfilter.h	2008-01-01 04:50:29.000000000 +0900

            

            

              3
              
@@ -62,7 +62,7 @@ public:

            

            

              4
              
 	int statistics(uint32_t&,uint32_t&) const;

            

            

              5
              
 	int receive(caddr_t) const;

            

            

              6
              
 	int send(caddr_t,uint32_t) const;

            

            

              7
              
-	uint32_t Bpfilter::getDLT() const;

            

            

              8
              
+	uint32_t getDLT() const;

            

            

              9
              
 };

            

            

              10
              
 inline int Bpfilter::fileDesc() const {return fd_;}

            

            

              11
              
 inline uint32_t Bpfilter::bufferSize() const {return bufsize_;}

            



(-)v6eval/files/patch-McIKE.h
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- lib/Pz/McIKE.h	2005-05-09 18:35:23.000000000 +0900

            

            

              2
              
+++ lib/Pz/McIKE.h	2008-01-01 04:36:34.000000000 +0900

            

            

              3
              
@@ -397,7 +397,7 @@ class WmISAKMP_Padding: public WmObject 

            

            

              4
              
 

            

            

              5
              
 class PaISAKMP: public PaESP {

            

            

              6
              
 	public:

            

            

              7
              
-		PaISAKMP::PaISAKMP(const MObject *m, CSTR st, int l):

            

            

              8
              
+		PaISAKMP(const MObject *m, CSTR st, int l):

            

            

              9
              
 			PaESP(m, st, l) {};

            

            

              10
              
 		virtual ~PaISAKMP() {}

            

            

              11
              
 

            



(-)v6eval/files/patch-MvFunction.cc
      (+10 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- lib/Pz/MvFunction.cc	2005-05-09 18:35:24.000000000 +0900

            

            

              2
              
+++ lib/Pz/MvFunction.cc	2008-01-01 04:41:51.000000000 +0900

            

            

              3
              
@@ -71,6 +71,7 @@ extern "C" {

            

            

              4
              
 #include <netinet/in.h>

            

            

              5
              
 #include <arpa/inet.h>

            

            

              6
              
 #include <openssl/hmac.h>

            

            

              7
              
+#include <openssl/md5.h>

            

            

              8
              
 #include <openssl/sha.h>

            

            

              9
              
 }

            

            

              10
              
 

            



(-)v6eval/files/patch-RAFControl.h
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- lib/pkt/RAFControl.h	2001-10-05 20:41:20.000000000 +0900

            

            

              2
              
+++ lib/pkt/RAFControl.h	2008-01-01 04:49:37.000000000 +0900

            

            

              3
              
@@ -69,7 +69,7 @@ virtual	const PaObject*	pop_SA(eAlgorith

            

            

              4
              
 	CSTR reverseEvaluate(const McObject&,PvOctets&,bool&);

            

            

              5
              
 	bool evaluateWith(RObject*,WObject*) const;

            

            

              6
              
 	WObject* evaluateAlgorithm(RObject*) const;

            

            

              7
              
-	WObject* RAFControl::evaluate(RObject*);

            

            

              8
              
+	WObject* evaluate(RObject*);

            

            

              9
              
 virtual	void reset();

            

            

              10
              
 	void applyFrame(const WObject* w) const;

            

            

              11
              
 	const WAlgorithm* appliedAlgorithm() const;

            



(-)v6eval/files/patch-hmac.c
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- lib/Pz/crypto/hmac/hmac.c	2002-05-27 18:56:19.000000000 +0900

            

            

              2
              
+++ lib/Pz/crypto/hmac/hmac.c	2008-01-01 04:48:38.000000000 +0900

            

            

              3
              
@@ -60,7 +60,7 @@

            

            

              4
              
 #include <stdio.h>

            

            

              5
              
 #include <stdlib.h>

            

            

              6
              
 #include <string.h>

            

            

              7
              
-#include <openssl/hmac.h>

            

            

              8
              
+#include "hmac.h"

            

            

              9
              
 

            

            

              10
              
 void HMAC_Init(HMAC_CTX *ctx, const void *key, int len,

            

            

              11
              
 	       const EVP_MD *md)

            



(-)v6eval/files/patch-sigcomp.c
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- bin/sigcomp/sigcomp.c	2005-05-27 20:40:19.000000000 +0900

            

            

              2
              
+++ bin/sigcomp/sigcomp.c	2008-01-01 06:03:23.000000000 +0900

            

            

              3
              
@@ -53,7 +53,7 @@

            

            

              4
              
 

            

            

              5
              
 #include <openssl/err.h>

            

            

              6
              
 #include <openssl/evp.h>

            

            

              7
              
-

            

            

              8
              
+#include <openssl/rsa.h>

            

            

              9
              
 

            

            

              10
              
 

            

            

              11
              
 #ifdef DEBUG

            



(-)v6eval/files/patch-x509dec.c
      (+18 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- bin/x509dec/x509dec.c	2005-05-30 19:17:31.000000000 +0900

            

            

              2
              
+++ bin/x509dec/x509dec.c	2008-01-01 06:02:24.000000000 +0900

            

            

              3
              
@@ -244,13 +244,13 @@ x509dec_on_evp(const X509 *const x509)

            

            

              4
              
 

            

            

              5
              
 	TAILQ_INIT(&head);

            

            

              6
              
 

            

            

              7
              
-	if(!((unsigned char *)pubkey =

            

            

              8
              
+	if(!(pubkey =

            

            

              9
              
 		X509dec_get_pubkey(x509, &pubkeylen))) {

            

            

              10
              
 

            

            

              11
              
 		return(x509dec_on_evp_return(false, pubkey, subject_name));

            

            

              12
              
 	}

            

            

              13
              
 

            

            

              14
              
-	if(!((unsigned char *)subject_name =

            

            

              15
              
+	if(!(subject_name =

            

            

              16
              
 		X509dec_get_subject_name(x509, (int *)&subject_namelen))) {

            

            

              17
              
 

            

            

              18
              
 		return(x509dec_on_evp_return(false, pubkey, subject_name));

            






  

  Return to bug 119398