Issue 4340 - Drop dependency on external xar tool

packagerSafari.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import base64
 import ConfigParser
 import json
 import os
 import re
 from urlparse import urlparse
@@ skipping 154 matching lines @@
 
     if metadata.has_section('import_locales'):
         importGeckoLocales(params, files)
 
     if metadata.has_option('general', 'testScripts'):
         files['qunit/index.html'] = createScriptPage(params, 'testIndex.html.tmpl',
                                                      ('general', 'testScripts'))
 
     if keyFile:
         from buildtools import xarfile
-        certs = xarfile.read_certificates(keyFile)
+        certs, key = xarfile.read_certificates_and_key(keyFile)
         params['developerIdentifier'] = get_developer_identifier(certs)
 
     files['lib/info.js'] = createInfoModule(params)
     files['background.html'] = createScriptPage(params, 'background.html.tmpl',
                                                 ('general', 'backgroundScripts'))
     files['Info.plist'] = createManifest(params, files)
 
     fixAbsoluteUrls(files)
 
     dirname = metadata.get('general', 'basename') + '.safariextension'
     for filename in files.keys():
         files[os.path.join(dirname, filename)] = files.pop(filename)
 
     if not devenv and keyFile:
         from buildtools import xarfile
         xarfile.create(outFile, files, keyFile)
     else:
         files.zip(outFile)