Mirrors/extract_otp_secrets
1
0
Fork 0
mirror of https://github.com/scito/extract_otp_secrets.git synced 2026-03-12 06:06:40 +01:00
Code Issues Packages Projects Releases 1 Wiki Activity

deps: upgrade protobuf 7.34.0

Browse Source
This commit is contained in:
scito
2026-03-06 20:30:06 +01:00
committed by Roland Kurmann
parent d96879011b
commit f5bac458c0
7 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Pipfile
View File

@@ -10,7 +10,7 @@ numpy = "2.4.2"
# for macOS: opencv-contrib-python = "<=4.7.0" # for macOS: opencv-contrib-python = "<=4.7.0"
pillow = "*" pillow = "*"
pyzbar = "*" pyzbar = "*"
protobuf = "6.33.5" protobuf = "7.34.0"
qrcode = "*" qrcode = "*"
qreader = "1.3.2" qreader = "1.3.2"

46
Pipfile.lock generated
View File

@@ -1,7 +1,7 @@
{ {
"_meta": { "_meta": {
"hash": { "hash": {
"sha256": "4b19cf2fa3e1ba934463575b4ea590abf0670b156d3b5aad521f54c281db0873" "sha256": "57139dd3a5d88ca79d3738630e0c1aafc4b1c2fc7d1d145783391935b359b56b"
}, },
"pipfile-spec": 6, "pipfile-spec": 6,
"requires": { "requires": {
@@ -233,20 +233,18 @@
}, },
"protobuf": { "protobuf": {
"hashes": [ "hashes": [
"sha256:3093804752167bcab3998bec9f1048baae6e29505adaf1afd14a37bddede533c", "sha256:3871a3df67c710aaf7bb8d214cc997342e63ceebd940c8c7fc65c9b3d697591a",
"sha256:69915a973dd0f60f31a08b8318b73eab2bd6a392c79184b3612226b0a3f8ec02", "sha256:4a72a8ec94e7a9f7ef7fe818ed26d073305f347f8b3b5ba31e22f81fd85fca02",
"sha256:6ddcac2a081f8b7b9642c09406bc6a4290128fce5f471cddd165960bb9119e5c", "sha256:8e329966799f2c271d5e05e236459fe1cbfdb8755aaa3b0914fa60947ddea408",
"sha256:8afa18e1d6d20af15b417e728e9f60f3aa108ee76f23c3b2c07a2c3b546d3afd", "sha256:964cf977e07f479c0697964e83deda72bcbc75c3badab506fb061b352d991b01",
"sha256:8f04fa32763dcdb4973d537d6b54e615cc61108c7cb38fe59310c3192d29510a", "sha256:9d7a5005fb96f3c1e64f397f91500b0eb371b28da81296ae73a6b08a5b76cdd6",
"sha256:9b71e0281f36f179d00cbcb119cb19dec4d14a81393e5ea220f64b286173e190", "sha256:9f9079f1dde4e32342ecbd1c118d76367090d4aaa19da78230c38101c5b3dd40",
"sha256:a3157e62729aafb8df6da2c03aa5c0937c7266c626ce11a278b6eb7963c4e37c", "sha256:e3b914dd77fa33fa06ab2baa97937746ab25695f389869afdf03e81f34e45dc7",
"sha256:a5cb85982d95d906df1e2210e58f8e4f1e3cdc088e52c921a041f9c9a0386de5", "sha256:f791ec509707a1d91bd02e07df157e75e4fb9fbdad12a81b7396201ec244e2e3"
"sha256:cbf16ba3350fb7b889fca858fb215967792dc125b35c7976ca4818bee3521cf0",
"sha256:d71b040839446bac0f4d162e758bea99c8251161dae9d0983a3b88dee345153b"
], ],
"index": "pypi", "index": "pypi",
"markers": "python_version >= '3.9'", "markers": "python_version >= '3.10'",
"version": "==6.33.5" "version": "==7.34.0"
}, },
"pyzbar": { "pyzbar": {
"hashes": [ "hashes": [
@@ -655,20 +653,18 @@
}, },
"protobuf": { "protobuf": {
"hashes": [ "hashes": [
"sha256:3093804752167bcab3998bec9f1048baae6e29505adaf1afd14a37bddede533c", "sha256:3871a3df67c710aaf7bb8d214cc997342e63ceebd940c8c7fc65c9b3d697591a",
"sha256:69915a973dd0f60f31a08b8318b73eab2bd6a392c79184b3612226b0a3f8ec02", "sha256:4a72a8ec94e7a9f7ef7fe818ed26d073305f347f8b3b5ba31e22f81fd85fca02",
"sha256:6ddcac2a081f8b7b9642c09406bc6a4290128fce5f471cddd165960bb9119e5c", "sha256:8e329966799f2c271d5e05e236459fe1cbfdb8755aaa3b0914fa60947ddea408",
"sha256:8afa18e1d6d20af15b417e728e9f60f3aa108ee76f23c3b2c07a2c3b546d3afd", "sha256:964cf977e07f479c0697964e83deda72bcbc75c3badab506fb061b352d991b01",
"sha256:8f04fa32763dcdb4973d537d6b54e615cc61108c7cb38fe59310c3192d29510a", "sha256:9d7a5005fb96f3c1e64f397f91500b0eb371b28da81296ae73a6b08a5b76cdd6",
"sha256:9b71e0281f36f179d00cbcb119cb19dec4d14a81393e5ea220f64b286173e190", "sha256:9f9079f1dde4e32342ecbd1c118d76367090d4aaa19da78230c38101c5b3dd40",
"sha256:a3157e62729aafb8df6da2c03aa5c0937c7266c626ce11a278b6eb7963c4e37c", "sha256:e3b914dd77fa33fa06ab2baa97937746ab25695f389869afdf03e81f34e45dc7",
"sha256:a5cb85982d95d906df1e2210e58f8e4f1e3cdc088e52c921a041f9c9a0386de5", "sha256:f791ec509707a1d91bd02e07df157e75e4fb9fbdad12a81b7396201ec244e2e3"
"sha256:cbf16ba3350fb7b889fca858fb215967792dc125b35c7976ca4818bee3521cf0",
"sha256:d71b040839446bac0f4d162e758bea99c8251161dae9d0983a3b88dee345153b"
], ],
"index": "pypi", "index": "pypi",
"markers": "python_version >= '3.9'", "markers": "python_version >= '3.10'",
"version": "==6.33.5" "version": "==7.34.0"
}, },
"pycodestyle": { "pycodestyle": {
"hashes": [ "hashes": [

10
README.md
View File

@@ -14,7 +14,7 @@
[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/StandWithUkraine.svg)](https://stand-with-ukraine.pp.ua) [![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/StandWithUkraine.svg)](https://stand-with-ukraine.pp.ua)
<!-- ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/protobuf) <!-- ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/protobuf)
[![GitHub Pipenv locked Python version](https://img.shields.io/github/pipenv/locked/python-version/scito/extract_otp_secrets)](https://github.com/scito/extract_otp_secrets/blob/master/Pipfile.lock) [![GitHub Pipenv locked Python version](https://img.shields.io/github/pipenv/locked/python-version/scito/extract_otp_secrets)](https://github.com/scito/extract_otp_secrets/blob/master/Pipfile.lock)
![protobuf 33.5version](https://img.shields.io/badge/protobuf-6.33.533.1-informational)--> ![protobuf 34.0version](https://img.shields.io/badge/protobuf-7.34.033.1-informational)-->
<!-- [![Github all releases](https://img.shields.io/github/downloads/scito/extract_otp_secrets/total.svg)](https://GitHub.com/scito/extract_otp_secrets/releases/) --> <!-- [![Github all releases](https://img.shields.io/github/downloads/scito/extract_otp_secrets/total.svg)](https://GitHub.com/scito/extract_otp_secrets/releases/) -->
@@ -385,7 +385,7 @@ python extract_otp_secrets.py = < example_export.png</pre>
* Provides a debug mode (-d) for analyzing import problems * Provides a debug mode (-d) for analyzing import problems
* Written in modern Python using type hints and following best practices * Written in modern Python using type hints and following best practices
* All these features are backed by tests ran nightly * All these features are backed by tests ran nightly
* All functionality in one Python script: src/extract_otp_secrets.py (except protobuf 33.5generated code in protobuf_generated_python) * All functionality in one Python script: src/extract_otp_secrets.py (except protobuf 34.0generated code in protobuf_generated_python)
## KeePass ## KeePass
@@ -748,11 +748,11 @@ sudo dnf install python3-pip perl envsubst
The export QR code of "Google Authenticator" contains the URL `otpauth-migration://offline?data=…`. The export QR code of "Google Authenticator" contains the URL `otpauth-migration://offline?data=…`.
The data parameter is a base64 encoded proto3 message (Google Protocol Buffers). The data parameter is a base64 encoded proto3 message (Google Protocol Buffers).
Command for regeneration of Python code from proto3 message definition file (only necessary in case of changes of the proto3 message definition or new protobuf 33.5versions): Command for regeneration of Python code from proto3 message definition file (only necessary in case of changes of the proto3 message definition or new protobuf 34.0versions):
protoc 33.5--plugin=protoc-33.5gen-mypy=path/to/protoc-33.5gen-mypy --python_out=src/protobuf_generated_python --mypy_out=src/protobuf_generated_python src/google_auth.proto protoc 34.0--plugin=protoc-34.0gen-mypy=path/to/protoc-34.0gen-mypy --python_out=src/protobuf_generated_python --mypy_out=src/protobuf_generated_python src/google_auth.proto
The generated protobuf 33.5Python code was generated by protoc 33.533.1 (https://github.com/protocolbuffers/protobuf/releases/tag/v33.533.1). The generated protobuf 34.0Python code was generated by protoc 34.033.1 (https://github.com/protocolbuffers/protobuf/releases/tag/v34.033.1).
For Python type hint generation the [mypy-protobuf](https://github.com/nipunn1313/mypy-protobuf) package is used. For Python type hint generation the [mypy-protobuf](https://github.com/nipunn1313/mypy-protobuf) package is used.

2
pyproject.toml
View File

@@ -43,7 +43,7 @@ dependencies = [
"numpy>=2.2,<2.3 ; python_version >= '3.10' and python_version < '3.11'", "numpy>=2.2,<2.3 ; python_version >= '3.10' and python_version < '3.11'",
"numpy>=2.4.1,<3.0 ; python_version >= '3.11'", "numpy>=2.4.1,<3.0 ; python_version >= '3.11'",
"Pillow", "Pillow",
"protobuf>=6.33.5", "protobuf>=7.34.0",
"pyzbar", "pyzbar",
"qrcode", "qrcode",
"qreader<2.0.0", "qreader<2.0.0",

2
requirements.txt
View File

@@ -3,7 +3,7 @@ opencv-contrib-python>=4.13.0
numpy>=2.2,<2.3 ; python_version >= "3.10" and python_version < "3.11" numpy>=2.2,<2.3 ; python_version >= "3.10" and python_version < "3.11"
numpy>=2.4.1,<3.0 ; python_version >= "3.11" numpy>=2.4.1,<3.0 ; python_version >= "3.11"
Pillow Pillow
protobuf>=6.33.5 protobuf>=7.34.0
pyzbar pyzbar
qrcode qrcode
qreader<2.0.0 qreader<2.0.0

8
src/protobuf_generated_python/google_auth_pb2.py
View File

@@ -2,7 +2,7 @@
# Generated by the protocol buffer compiler. DO NOT EDIT! # Generated by the protocol buffer compiler. DO NOT EDIT!
# NO CHECKED-IN PROTOBUF GENCODE # NO CHECKED-IN PROTOBUF GENCODE
# source: google_auth.proto # source: google_auth.proto
# Protobuf Python Version: 6.33.5 # Protobuf Python Version: 7.34.0
"""Generated protocol buffer code.""" """Generated protocol buffer code."""
from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor as _descriptor
from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import descriptor_pool as _descriptor_pool
@@ -11,9 +11,9 @@ from google.protobuf import symbol_database as _symbol_database
from google.protobuf.internal import builder as _builder from google.protobuf.internal import builder as _builder
_runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.ValidateProtobufRuntimeVersion(
_runtime_version.Domain.PUBLIC, _runtime_version.Domain.PUBLIC,
6, 7,
33, 34,
5, 0,
'', '',
'google_auth.proto' 'google_auth.proto'
) )

2
uv.lock generated
View File

@@ -37,7 +37,7 @@ requires-dist = [
{ name = "numpy", marker = "python_full_version >= '3.11'", specifier = ">=2.4.1,<3.0" }, { name = "numpy", marker = "python_full_version >= '3.11'", specifier = ">=2.4.1,<3.0" },
{ name = "opencv-contrib-python", specifier = ">=4.13.0" }, { name = "opencv-contrib-python", specifier = ">=4.13.0" },
{ name = "pillow" }, { name = "pillow" },
{ name = "protobuf", specifier = ">=6.33.5" }, { name = "protobuf", specifier = ">=7.34.0" },
{ name = "pyzbar" }, { name = "pyzbar" },
{ name = "qrcode" }, { name = "qrcode" },
{ name = "qreader", specifier = "<2.0.0" }, { name = "qreader", specifier = "<2.0.0" },