cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove patches which are no longer needed now that Cryptodome replaced Crypto

Browse Source
This commit is contained in:
jasper 2018-06-02 12:01:58 +00:00
parent 19b8b3bd4a
commit da873a607c
29 changed files with 32 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/spe/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.16 2018/04/29 10:13:57 jasper Exp $
# $OpenBSD: Makefile,v 1.17 2018/06/02 12:01:59 jasper Exp $
COMMENT= SPE -- Stani's Python Editor
V= 0.8.4
DISTNAME= spe-$V.h-wx2.6.1.0
PKGNAME= spe-$Vh
REVISION= 7
REVISION= 8
CATEGORIES= devel
HOMEPAGE= http://pythonide.stani.be/

16
devel/spe/patches/patch-_spe_SPE_py
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-_spe_SPE_py,v 1.1 2018/04/29 10:13:57 jasper Exp $
py-crypto -> py-cryptodome
Index: _spe/SPE.py
--- _spe/SPE.py.orig
+++ _spe/SPE.py
@@ -67,7 +67,7 @@ except ImportError:
#---Crypto
try:
- from Crypto.Cipher import DES
+ from Cryptodome.Cipher import DES
fCrypto = True
print "Encrypted debugging enabled.\n"
except ImportError:

16
devel/spe/patches/patch-_spe_plugins_winpdb_rpdb2_py
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-_spe_plugins_winpdb_rpdb2_py,v 1.1 2018/04/29 10:13:57 jasper Exp $
py-crypto -> py-cryptodome
Index: _spe/plugins/winpdb/rpdb2.py
--- _spe/plugins/winpdb/rpdb2.py.orig
+++ _spe/plugins/winpdb/rpdb2.py
@@ -320,7 +320,7 @@ except:
pass
try:
- from Crypto.Cipher import DES
+ from Cryptodome.Cipher import DES
except ImportError:
pass

4
mail/mailpile/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2018/05/18 20:06:32 jasper Exp $
# $OpenBSD: Makefile,v 1.5 2018/06/02 12:01:59 jasper Exp $
COMMENT = mail client with encryption and privacy features
PKGNAME = ${DISTNAME:L}
GH_ACCOUNT = mailpile
GH_PROJECT = Mailpile
GH_TAGNAME = 1.0.0rc2
REVISION = 1
REVISION = 2
CATEGORIES = mail

18
mail/mailpile/patches/patch-mailpile_crypto_aes_utils_py
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-mailpile_crypto_aes_utils_py,v 1.1 2018/05/18 20:06:32 jasper Exp $
py-crypto -> py-cryptodome
Index: mailpile/crypto/aes_utils.py
--- mailpile/crypto/aes_utils.py.orig
+++ mailpile/crypto/aes_utils.py
@@ -51,8 +51,8 @@ def make_cryptography_utils():
def make_pycrypto_utils():
- from Crypto.Cipher import AES
- from Crypto.Util import Counter
+ from Cryptodome.Cipher import AES
+ from Cryptodome.Util import Counter
def _nonce_as_int(nonce):
i1, i2, i3, i4 = struct.unpack(">IIII", nonce)

9
multimedia/streamlink/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2018/05/13 07:10:25 jasper Exp $
# $OpenBSD: Makefile,v 1.11 2018/06/02 12:01:59 jasper Exp $
COMMENT = pipe video streams into a video player
CATEGORIES = multimedia net
@ -6,7 +6,7 @@ CATEGORIES = multimedia net
GH_ACCOUNT = streamlink
GH_PROJECT = streamlink
GH_TAGNAME = 0.12.1
REVISION = 0
REVISION = 1
HOMEPAGE = https://streamlink.github.io/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
@ -35,9 +35,4 @@ TEST_DEPENDS = devel/py-country${MODPY_FLAVOR} \
www/py-requests-mock${MODPY_FLAVOR} \
${RUN_DEPENDS}
# py-crypto -> py-cryptodome
pre-patch:
sed -i 's,Crypto\.,Cryptodome\.,g' ${WRKSRC}/tests/*.py \
${WRKSRC}/src/streamlink/*/*.py
.include <bsd.port.mk>

4
multimedia/yle-dl/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.16 2018/05/22 08:18:08 sthen Exp $
# $OpenBSD: Makefile,v 1.17 2018/06/02 12:01:59 jasper Exp $
GH_ACCOUNT = aajanki
GH_PROJECT = yle-dl
GH_TAGNAME = 2.28
MODPY_EGG_VERSION = ${GH_TAGNAME}
REVISION = 1
REVISION = 2
COMMENT = download videos from YLE Areena

16
multimedia/yle-dl/patches/patch-yledl_downloaders_py
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-yledl_downloaders_py,v 1.1 2018/05/13 07:13:05 jasper Exp $
py-crypto -> py-cryptodome
Index: yledl/downloaders.py
--- yledl/downloaders.py.orig
+++ yledl/downloaders.py
@@ -24,7 +24,7 @@ import lxml.etree
import requests
import hds
from requests.adapters import HTTPAdapter
-from Crypto.Cipher import AES
+from Cryptodome.Cipher import AES
from pkg_resources import resource_filename
from version import version
from utils import print_enc

3
net/gajim/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.81 2018/05/21 06:10:43 feinerer Exp $
# $OpenBSD: Makefile,v 1.82 2018/06/02 12:01:59 jasper Exp $
COMMENT= jabber client written in pygtk
MODPY_EGG_VERSION= 1.0.3
DISTNAME= gajim-${MODPY_EGG_VERSION}
REVISION= 0
CATEGORIES= net x11
HOMEPAGE= https://www.gajim.org

16
net/gajim/patches/patch-gajim_common_app_py
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-gajim_common_app_py,v 1.1 2018/05/21 06:10:43 feinerer Exp $
py-crypto -> py-cryptodome
Index: gajim/common/app.py
--- gajim/common/app.py.orig
+++ gajim/common/app.py
@@ -164,7 +164,7 @@ except ImportError:
HAVE_PYCRYPTO = True
try:
- __import__('Crypto')
+ __import__('Cryptodome')
except ImportError:
HAVE_PYCRYPTO = False

18
net/gajim/patches/patch-gajim_common_stanza_session_py
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-gajim_common_stanza_session_py,v 1.1 2018/05/21 06:10:43 feinerer Exp $
py-crypto -> py-cryptodome
Index: gajim/common/stanza_session.py
--- gajim/common/stanza_session.py.orig
+++ gajim/common/stanza_session.py
@@ -41,8 +41,8 @@ import logging
log = logging.getLogger('gajim.c.stanza_session')
if app.HAVE_PYCRYPTO:
- from Crypto.Cipher import AES
- from Crypto.PublicKey import RSA
+ from Cryptodome.Cipher import AES
+ from Cryptodome.PublicKey import RSA
from gajim.common import dh
from gajim import secrets

16
net/gajim/patches/patch-gajim_secrets_py
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-gajim_secrets_py,v 1.1 2018/05/21 06:10:43 feinerer Exp $
py-crypto -> py-cryptodome
Index: gajim/secrets.py
--- gajim/secrets.py.orig
+++ gajim/secrets.py
@@ -21,7 +21,7 @@
from gajim.common.configpaths import gajimpaths
-import Crypto
+import Cryptodome
from gajim.common import crypto
from gajim.common import exceptions

8
net/py-impacket/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.19 2018/05/12 21:01:05 jasper Exp $
# $OpenBSD: Makefile,v 1.20 2018/06/02 12:01:59 jasper Exp $
COMMENT = Python classes providing access to network packets
MODPY_EGG_VERSION = 0.9.15
DISTNAME = impacket-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
REVISION = 1
REVISION = 2
EPOCH = 0
CATEGORIES = net security
@ -39,10 +39,6 @@ RUN_DEPENDS = devel/py-asn1>=0.1.7 \
NO_TEST = Yes
# py-crypto -> py-cryptodome
pre-patch:
sed -i 's,Crypto\.,Cryptodome\.,g' ${WRKSRC}/**/*.py
pre-configure:
${SUBST_CMD} ${WRKSRC}/examples/goldenPac.py \
${WRKSRC}/examples/nmapAnswerMachine.py \

15
net/py-snmp/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.22 2018/05/12 19:45:22 jasper Exp $
# $OpenBSD: Makefile,v 1.23 2018/06/02 12:01:58 jasper Exp $
COMMENT= SNMP framework for Python
MODPY_EGG_VERSION = 4.3.2
DISTNAME= pysnmp-${MODPY_EGG_VERSION}
PKGNAME= ${DISTNAME:S/py/py-/}
REVISION= 0
REVISION= 1
CATEGORIES= net
HOMEPAGE= http://pysnmp.sourceforge.net/
@ -26,17 +26,6 @@ RUN_DEPENDS = security/py-cryptodome \
DOCSDIR= ${PREFIX}/share/doc/py-snmp
EXAMPLESDIR= ${PREFIX}/share/examples/py-snmp
# py-crypto -> py-cryptodome
_CRYPTO = pysnmp/proto/secmod/eso/priv/des3.py \
pysnmp/proto/secmod/rfc3826/priv/aes.py \
pysnmp/proto/secmod/rfc3414/priv/des.py
pre-patch:
.for p in ${_CRYPTO}
sed -i 's,Crypto,Cryptodome,g' ${WRKSRC}/$p
.endfor
###
post-install:
${INSTALL_DATA_DIR} ${DOCSDIR} ${EXAMPLESDIR}
cd ${WRKSRC}/docs; tar cf - . | tar xf - -C ${DOCSDIR}

18
net/scapy/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.26 2018/05/14 06:54:47 jasper Exp $
# $OpenBSD: Makefile,v 1.27 2018/06/02 12:01:58 jasper Exp $
COMMENT= powerful interactive packet manipulation in python
MODPY_EGG_VERSION= 2.3.3
DISTNAME= scapy-${MODPY_EGG_VERSION}
REVISION = 3
REVISION = 4
CATEGORIES= net
@ -36,20 +36,6 @@ PKG_ARCH= *
post-extract:
gunzip ${WRKSRC}/doc/scapy.1.gz
# py-crypto -> py-cryptodome
_PYCRYPTO = scapy/layers/dot11.py \
scapy/layers/ipsec.py \
scapy/layers/ntp.py \
scapy/layers/tls/cert.py \
scapy/layers/tls/crypto/pkcs1.py \
scapy/layers/tls/__init__.py \
scapy/contrib/ospf.py
pre-patch:
.for f in ${_PYCRYPTO}
sed -i 's,from Crypto,from Cryptodome,g' ${WRKSRC}/$f
.endfor
pre-configure:
sed -i "s,/etc/ethertypes,${SYSCONFDIR}/ethertypes,g" \
${WRKSRC}/scapy/data.py

3
security/plaso/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.8 2018/05/30 09:13:46 rpointel Exp $
# $OpenBSD: Makefile,v 1.9 2018/06/02 12:01:59 jasper Exp $
COMMENT = engine and tools to automate creation of super timeline
MODPY_EGG_VERSION = 20180524
DISTNAME = plaso-${MODPY_EGG_VERSION}
REVISION = 0
DISTFILES = ${DISTNAME}_1{${DISTNAME}}${EXTRACT_SUFX}

16
security/plaso/patches/patch-plaso_dependencies_py
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-plaso_dependencies_py,v 1.1 2018/05/13 13:48:39 jasper Exp $
py-crypto -> py-cryptodome
Index: plaso/dependencies.py
--- plaso/dependencies.py.orig
+++ plaso/dependencies.py
@@ -21,7 +21,7 @@ PYTHON_DEPENDENCIES = {
'certifi': ('__version__', '2016.9.26', None, True),
'chardet': ('__version__', '2.0.1', None, True),
'construct': ('__version__', '2.5.2', '2.5.3', True),
- 'Crypto': ('__version__', '2.6', None, True),
+ 'Cryptodome': ('__version__', '2.6', None, True),
'dateutil': ('__version__', '1.5', None, True),
'dfdatetime': ('__version__', '20180110', None, True),
'dfvfs': ('__version__', '20171230', None, True),

7
security/py-dfvfs/Makefile
View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.9 2018/05/30 09:10:59 rpointel Exp $
# $OpenBSD: Makefile,v 1.10 2018/06/02 12:01:58 jasper Exp $
COMMENT = Digital Forensics Virtual File System (dfVFS)
MODPY_EGG_VERSION = 20180510
DISTNAME = dfvfs-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
REVISION = 0
CATEGORIES = security
@ -38,10 +39,6 @@ RUN_DEPENDS += devel/py-construct \
sysutils/libvshadow \
sysutils/libvslvm
# py-crypto -> py-cryptodome
pre-patch:
sed -i 's,Crypto\.,Cryptodome\.,g' ${WRKSRC}/dfvfs/encryption/*.py
do-test:
touch ${WRKSRC}/utils/__init__.py
cd ${WRKSRC} && LC_CTYPE='en_US.UTF-8' ${MODPY_BIN} run_tests.py

4
security/py-keyczar/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.6 2018/05/14 18:54:13 jasper Exp $
# $OpenBSD: Makefile,v 1.7 2018/06/02 12:01:59 jasper Exp $
COMMENT = toolkit for safe and simple cryptography
MODPY_EGG_VERSION = 0.716
DISTNAME = python-keyczar-${MODPY_EGG_VERSION}
PKGNAME = py-keyczar-${MODPY_EGG_VERSION}
REVISION = 0
REVISION = 1
EPOCH = 0
CATEGORIES = security

20
security/py-keyczar/patches/patch-src_keyczar_keys_py
View File

@ -1,20 +0,0 @@
$OpenBSD: patch-src_keyczar_keys_py,v 1.1 2018/05/14 18:54:13 jasper Exp $
py-crypto -> py-cryptodome
Index: src/keyczar/keys.py
--- src/keyczar/keys.py.orig
+++ src/keyczar/keys.py
@@ -30,9 +30,9 @@ try:
except ImportError:
import sha as sha1
-from Crypto.Cipher import AES
-from Crypto.PublicKey import DSA
-from Crypto.PublicKey import RSA
+from Cryptodome.Cipher import AES
+from Cryptodome.PublicKey import DSA
+from Cryptodome.PublicKey import RSA
try:
import simplejson as json
except ImportError:

4
security/py-potr/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2018/05/13 06:39:22 jasper Exp $
# $OpenBSD: Makefile,v 1.4 2018/06/02 12:01:59 jasper Exp $
COMMENT = pure Python Off-The-Record encryption
@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 1.0.1
DISTNAME = python-potr-${MODPY_EGG_VERSION}
PKGNAME = py-potr-${MODPY_EGG_VERSION}
CATEGORIES = security net
REVISION = 1
REVISION = 2
MAINTAINER = Daniel Jakots <obsd@chown.me>

16
security/py-potr/patches/patch-setup_py
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-setup_py,v 1.1 2018/05/13 06:39:22 jasper Exp $
py-crypto -> py-cryptodome
Index: setup.py
--- setup.py.orig
+++ setup.py
@@ -22,7 +22,7 @@ try:
from setuptools.command.install_lib import install_lib
- args['install_requires']=['pycrypto>=2.1']
+ args['install_requires']=['pycryptodomex>=2.1']
except ImportError:
print('\n*** setuptools not found! Falling back to distutils\n\n')
from distutils.core import setup

26
security/py-potr/patches/patch-src_potr_compatcrypto_pycrypto_py
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-src_potr_compatcrypto_pycrypto_py,v 1.1 2018/05/13 06:39:22 jasper Exp $
py-crypto -> py-cryptodome
Index: src/potr/compatcrypto/pycrypto.py
--- src/potr/compatcrypto/pycrypto.py.orig
+++ src/potr/compatcrypto/pycrypto.py
@@ -15,12 +15,12 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.
-from Crypto import Cipher
-from Crypto.Hash import SHA256 as _SHA256
-from Crypto.Hash import SHA as _SHA1
-from Crypto.Hash import HMAC as _HMAC
-from Crypto.PublicKey import DSA
-from Crypto.Random import random
+from Cryptodome import Cipher
+from Cryptodome.Hash import SHA256 as _SHA256
+from Cryptodome.Hash import SHA as _SHA1
+from Cryptodome.Hash import HMAC as _HMAC
+from Cryptodome.PublicKey import DSA
+from Cryptodome.Random import random
from numbers import Number
from potr.compatcrypto import common

8
security/volatility/Makefile
View File

@ -4,7 +4,7 @@ COMMENT = memory artifact extraction utility framework
MODPY_EGG_VERSION = 2.6
DISTNAME = volatility-${MODPY_EGG_VERSION}
REVISION = 0
REVISION = 1
EXTRACT_SUFX = .zip
@ -31,12 +31,6 @@ WRKDIST = ${WRKDIR}/volatility-master
NO_TEST = Yes
# py-crypto -> py-cryptodome
pre-patch:
sed -i 's,Crypto\.,Cryptodome\.,g' ${WRKSRC}/volatility/win32/domcachedump.py \
${WRKSRC}/volatility/win32/hashdump.py \
${WRKSRC}/volatility/win32/lsasecrets.py
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/volatility/
.for dir in contrib tools

12
security/yubiserve/patches/patch-yubiserve_py
View File

@ -1,6 +1,4 @@
$OpenBSD: patch-yubiserve_py,v 1.7 2018/05/14 06:55:45 jasper Exp $
py-crypto -> py-cryptodome
$OpenBSD: patch-yubiserve_py,v 1.8 2018/06/02 12:01:59 jasper Exp $
sqlite3 support from
http://code.google.com/p/yubico-yubiserve/source/list r39
@ -11,16 +9,12 @@ and they wrap after between 0 and 24-and-a-bit days uptime causing failures.
Index: yubiserve.py
--- yubiserve.py.orig
+++ yubiserve.py
@@ -1,7 +1,7 @@
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!${MODPY_BIN}
import re, os, time, socket
import urlparse, SocketServer, urllib, BaseHTTPServer
-from Crypto.Cipher import AES
+from Cryptodome.Cipher import AES
from OpenSSL import SSL
import hmac, hashlib
from threading import Thread
from Crypto.Cipher import AES
@@ -10,12 +10,16 @@ try:
except ImportError:
pass

16
sysutils/ansible/patches/patch-lib_ansible_executor_process_worker_py
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-lib_ansible_executor_process_worker_py,v 1.1 2018/05/14 18:54:26 jasper Exp $
py-crypto -> py-cryptodome
Index: lib/ansible/executor/process/worker.py
--- lib/ansible/executor/process/worker.py.orig
+++ lib/ansible/executor/process/worker.py
@@ -28,7 +28,7 @@ from jinja2.exceptions import TemplateNotFound
HAS_PYCRYPTO_ATFORK = False
try:
- from Crypto.Random import atfork
+ from Cryptodome.Random import atfork
HAS_PYCRYPTO_ATFORK = True
except:
# We only need to call atfork if pycrypto is used because it will need to

32
sysutils/ansible/patches/patch-lib_ansible_parsing_vault___init___py
View File

@ -1,32 +0,0 @@
$OpenBSD: patch-lib_ansible_parsing_vault___init___py,v 1.1 2018/05/14 18:54:26 jasper Exp $
py-crypto -> py-cryptodome
Index: lib/ansible/parsing/vault/__init__.py
--- lib/ansible/parsing/vault/__init__.py.orig
+++ lib/ansible/parsing/vault/__init__.py
@@ -55,19 +55,19 @@ except ImportError:
pass
try:
- from Crypto.Cipher import AES as AES_pycrypto
+ from Cryptodome.Cipher import AES as AES_pycrypto
HAS_SOME_PYCRYPTO = True
# Note: Only used for loading obsolete VaultAES files. All files are written
# using the newer VaultAES256 which does not require md5
- from Crypto.Hash import SHA256 as SHA256_pycrypto
- from Crypto.Hash import HMAC as HMAC_pycrypto
+ from Cryptodome.Hash import SHA256 as SHA256_pycrypto
+ from Cryptodome.Hash import HMAC as HMAC_pycrypto
# Counter import fails for 2.0.1, requires >= 2.6.1 from pip
- from Crypto.Util import Counter as Counter_pycrypto
+ from Cryptodome.Util import Counter as Counter_pycrypto
# KDF import fails for 2.0.1, requires >= 2.6.1 from pip
- from Crypto.Protocol.KDF import PBKDF2 as PBKDF2_pycrypto
+ from Cryptodome.Protocol.KDF import PBKDF2 as PBKDF2_pycrypto
HAS_PYCRYPTO = True
except ImportError:
pass

12
www/py-beaker/patches/patch-beaker_crypto_pycrypto_py
View File

@ -1,6 +1,4 @@
$OpenBSD: patch-beaker_crypto_pycrypto_py,v 1.2 2018/05/12 20:05:25 jasper Exp $
- py-crypto -> py-cryptodome
$OpenBSD: patch-beaker_crypto_pycrypto_py,v 1.3 2018/06/02 12:01:59 jasper Exp $
- Security fix for CVE-2012-3458, py-beaker weak use of crypto can
leak information to remote attackers.
@ -9,13 +7,11 @@ $OpenBSD: patch-beaker_crypto_pycrypto_py,v 1.2 2018/05/12 20:05:25 jasper Exp $
Index: beaker/crypto/pycrypto.py
--- beaker/crypto/pycrypto.py.orig
+++ beaker/crypto/pycrypto.py
@@ -14,18 +14,20 @@ try:
aesDecrypt = aesEncrypt
@@ -15,17 +15,19 @@ try:
except ImportError:
- from Crypto.Cipher import AES
+ from Cryptodome.Cipher import AES
+ from Cryptodome.Util import Counter
from Crypto.Cipher import AES
+ from Crypto.Util import Counter
def aesEncrypt(data, key):
- cipher = AES.new(key)

16
www/py-beaker/patches/patch-beaker_crypto_util_py
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-beaker_crypto_util_py,v 1.1 2018/05/12 20:05:25 jasper Exp $
py-crypto -> py-cryptodome
Index: beaker/crypto/util.py
--- beaker/crypto/util.py.orig
+++ beaker/crypto/util.py
@@ -4,7 +4,7 @@ from beaker import util
try:
# Use PyCrypto (if available)
- from Crypto.Hash import HMAC as hmac, SHA as hmac_sha1
+ from Cryptodome.Hash import HMAC as hmac, SHA as hmac_sha1
sha1 = hmac_sha1.new
except ImportError: