From patchwork Sun Oct 25 10:56:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Herbert X-Patchwork-Id: 1387176 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.osmocom.org (client-ip=2a01:4f8:191:444b::2:7; helo=lists.osmocom.org; envelope-from=openbsc-bounces@lists.osmocom.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=F7xvMxGS; dkim-atps=neutral Received: from lists.osmocom.org (lists.osmocom.org [IPv6:2a01:4f8:191:444b::2:7]) by ozlabs.org (Postfix) with ESMTP id 4CJw125k2Nz9sSs for ; Sun, 25 Oct 2020 21:57:58 +1100 (AEDT) Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76]) by lists.osmocom.org (Postfix) with ESMTP id ED1CD19D3A0; Sun, 25 Oct 2020 10:57:55 +0000 (UTC) Authentication-Results: lists.osmocom.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.osmocom.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=F7xvMxGS X-Original-To: openbsc@lists.osmocom.org Delivered-To: openbsc@lists.osmocom.org Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2607:f8b0:4864:20::102d; helo=mail-pj1-x102d.google.com; envelope-from=jeremy.006@gmail.com; receiver= Authentication-Results: lists.osmocom.org; dmarc=pass (p=none dis=none) header.from=gmail.com Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lists.osmocom.org (Postfix) with ESMTP id AA3AC19D389 for ; Sun, 25 Oct 2020 10:57:41 +0000 (UTC) Received: by mail-pj1-x102d.google.com with SMTP id g16so1595465pjv.3 for ; Sun, 25 Oct 2020 03:57:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mu3cZ9Ulqf6zlsG2A9i7NhvbRvRAwnTBOxXW0Gw68Fg=; b=F7xvMxGS198ZwaEO3sjRo53KvWRyGfmxKFqermpMV6ze/MW6Kt2bLqaCD6LrziNGFB B69dOBc3iMSkO8VQeGdEOrMmdgO582apD7KsPYRGp1fMiTl0BzMP8X2+GE/g1twFe9QK VrcIpoBDBOV/1SzgMJEJFbqSgqoeFbTVUZj1bcVDytU58gslcc9pHjuBKojs3ghtpQCE JMxIjgkLWoyWAgMa+8X0fqM47pVnXnpfIJEyWcFrLCgL0iiDfRz63vBjbyFXYBANeB6I oIB/NTAiHBmQ3q6WgyiY6HtJokZbzlsUaezjFvKJ7tf/LeeXRUEg/eDDc1e3KBg+PO/O LA3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mu3cZ9Ulqf6zlsG2A9i7NhvbRvRAwnTBOxXW0Gw68Fg=; b=PTKrej33IEUWOtEYPfC7d37aRvbr9pInFO8Iy6r/IP0pTP2iEOVmLSHe+uic+ljhZT lduf+DuJPaiWKDZMRHp147AZD1a1/m4cJejWXaRGoMfYK8Y5c8m0D4yzXnSt+VnpMvIg WuUJa1hvD4UtfokpRO9kFBklK0PpbTtcFI+tzbbmoE7gJy4jKNpeMu06WGtzR7CiDXzl h0QrzoiPc73u1a29MkXmcE5CNLa14lArPbysPV3T64k6gJ4LX3yHuTt93nj6e9rWDPEc FfDA9oW6ueSZDLf+A/NTHjbO16fo8Efz4ghw0W+hvM0y0diNkTuxkDFfc+5oiMBXY0my XKUQ== X-Gm-Message-State: AOAM532gJHjnYXeyVLh2QJ7NNQcxHBVktn8Gr4HZVh4AGWQbhmId1Ibq HX/EuZgd3puBz00tlKoJblM4Um1sXrs= X-Google-Smtp-Source: ABdhPJwXEKQ4LpHUNjBsyUudnXcL97qn9s1KT6f3qx5sV3ZsN36jUSQFBMxASGfubXi2CjrQnL/9ow== X-Received: by 2002:a17:90b:4d08:: with SMTP id mw8mr13358393pjb.61.1603623460600; Sun, 25 Oct 2020 03:57:40 -0700 (PDT) Received: from localhost.localdomain (60-240-120-73.tpgi.com.au. [60.240.120.73]) by smtp.gmail.com with ESMTPSA id n5sm7547538pgm.82.2020.10.25.03.57.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Oct 2020 03:57:39 -0700 (PDT) From: Jeremy Herbert To: openbsc@lists.osmocom.org Cc: Jeremy Herbert Subject: [PATCH 1/1] make random seed function python3 compatible Date: Sun, 25 Oct 2020 20:56:05 +1000 Message-Id: <20201025105605.5692-2-jeremy.006@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201025105605.5692-1-jeremy.006@gmail.com> References: <20201025105605.5692-1-jeremy.006@gmail.com> MIME-Version: 1.0 X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Development of OsmoBTS, OpenBSC, OsmoBSC, OsmoNITB, OsmoMSC, OsmoMGW, OsmoSIPconnector" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openbsc-bounces@lists.osmocom.org Sender: "OpenBSC" --- pySim-prog.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pySim-prog.py b/pySim-prog.py index 942cfb0..e172d80 100755 --- a/pySim-prog.py +++ b/pySim-prog.py @@ -225,8 +225,9 @@ def parse_options(): def _digits(secret, usage, len, num): - s = hashlib.sha1(secret + usage + '%d' % num) - d = ''.join(['%02d'%ord(x) for x in s.digest()]) + seed = secret + usage + '%d' % num + s = hashlib.sha1(seed.encode()) + d = ''.join(['%02d' % x for x in s.digest()]) return d[0:len] def _mcc_mnc_digits(mcc, mnc):