Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a74a4811 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 3f5326fd: Merge "sha module is deprecated" 

* commit '3f5326fd':
  sha module is deprecated
parents 8dd289d3 3f5326fd

tools/releasetools/check_target_files_signatures

+6 −2
Original line number Diff line number Diff line
@@ -47,12 +47,16 @@ if sys.hexversion < 0x02040000: 


import os

import re

import sha

import shutil

import subprocess

import tempfile

import zipfile



try:

  from hashlib import sha1 as sha1

except ImportError:

  from sha import sha as sha1



import common



# Work around a bug in python's zipfile module that prevents opening
@@ -112,7 +116,7 @@ class CertDB(object): 
        self.certs[cert] = self.certs[cert] + "," + name

    else:

      if name is None:

        name = "unknown cert %s (%s)" % (sha.sha(cert).hexdigest()[:12],

        name = "unknown cert %s (%s)" % (sha1(cert).hexdigest()[:12],

                                         GetCertSubject(cert))

      self.certs[cert] = name

tools/releasetools/common.py

+6 −2
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import imp 
import os

import platform

import re

import sha

import shutil

import subprocess

import sys
@@ -29,6 +28,11 @@ import threading 
import time

import zipfile



try:

  from hashlib import sha1 as sha1

except ImportError:

  from sha import sha as sha1



# missing in Python 2.4 and before

if not hasattr(os, "SEEK_SET"):

  os.SEEK_SET = 0
@@ -659,7 +663,7 @@ class File(object): 
    self.name = name

    self.data = data

    self.size = len(data)

    self.sha1 = sha.sha(data).hexdigest()

    self.sha1 = sha1(data).hexdigest()



  def WriteToTemp(self):

    t = tempfile.NamedTemporaryFile()

tools/releasetools/ota_from_target_files

+7 −3
Original line number Diff line number Diff line
@@ -56,12 +56,16 @@ import copy 
import errno

import os

import re

import sha

import subprocess

import tempfile

import time

import zipfile



try:

  from hashlib import sha1 as sha1

except ImportError:

  from sha import sha as sha1



import common

import edify_generator
@@ -318,7 +322,7 @@ def MakeRecoveryPatch(output_zip, recovery_img, boot_img): 
  # we check to see if this recovery has already been installed by

  # testing just the first 2k.

  HEADER_SIZE = 2048

  header_sha1 = sha.sha(recovery_img.data[:HEADER_SIZE]).hexdigest()

  header_sha1 = sha1(recovery_img.data[:HEADER_SIZE]).hexdigest()

  sh = """#!/system/bin/sh

if ! applypatch -c %(recovery_type)s:%(recovery_device)s:%(header_size)d:%(header_sha1)s; then

  log -t recovery "Installing new recovery image"
@@ -501,7 +505,7 @@ def WriteIncrementalOTAPackage(target_zip, source_zip, output_zip): 
      verbatim_targets.append((tf.name, tf.size))

    else:

      common.ZipWriteStr(output_zip, "patch/" + tf.name + ".p", d)

      patch_list.append((tf.name, tf, sf, tf.size, sha.sha(d).hexdigest()))

      patch_list.append((tf.name, tf, sf, tf.size, sha1(d).hexdigest()))

      largest_source_size = max(largest_source_size, sf.size)



  source_fp = GetBuildProp("ro.build.fingerprint", source_zip)