Merge branch 'master' of github.com:CIRCL/PyMISP

pull/4/head
Alexandre Dulaunoy 2016-03-01 15:54:17 +01:00
commit ec7337cbc2
5 changed files with 10 additions and 10 deletions

View File

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
from pymisp import PyMISP
from keys import misp_url, misp_key
from keys import misp_url, misp_key,misp_verifycert
import argparse
import os
import json
@ -12,7 +12,7 @@ import json
def init(url, key):
return PyMISP(url, key, True, 'json')
return PyMISP(url, key, misp_verifycert, 'json')
def get_event(m, event, out=None):

View File

@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
from pymisp import PyMISP
from keys import misp_url, misp_key
from keys import misp_url, misp_key,misp_verifycert
import argparse
import os
import json
@ -12,7 +12,7 @@ import json
def init(url, key):
return PyMISP(url, key, True, 'json')
return PyMISP(url, key, misp_verifycert, 'json')
def download_last(m, last, out=None):

View File

@ -2,14 +2,14 @@
# -*- coding: utf-8 -*-
from pymisp import PyMISP
from keys import misp_url, misp_key
from keys import misp_url, misp_key,misp_verifycert
import argparse
import os
import json
def init(url, key):
return PyMISP(url, key, True, 'json')
return PyMISP(url, key, misp_verifycert, 'json')
def searchall(m, search, quiet, url, out=None):

View File

@ -2,14 +2,14 @@
# -*- coding: utf-8 -*-
from pymisp import PyMISP
from keys import misp_url, misp_key
from keys import misp_url, misp_key,misp_verifycert
import argparse
import os
import glob
def init(url, key):
return PyMISP(url, key, True, 'json')
return PyMISP(url, key, misp_verifycert, 'json')
def upload_files(m, eid, paths, distrib, ids, categ, info, analysis, threat):

View File

@ -2,13 +2,13 @@
# -*- coding: utf-8 -*-
from pymisp import PyMISP
from keys import misp_url, misp_key
from keys import misp_url, misp_key,misp_verifycert
import argparse
import os
def init(url, key):
return PyMISP(url, key, True, 'json')
return PyMISP(url, key, misp_verifycert, 'json')
def get_yara(m, event_id, out=None):