Merge branch 'debian' into 'dev'

Debian

See merge request oscar.krause/fastapi-dls!11
This commit is contained in:
Oscar Krause
2022-12-28 09:16:32 +01:00
8 changed files with 255 additions and 5 deletions

View File

@@ -19,8 +19,14 @@ from starlette.middleware.cors import CORSMiddleware
from starlette.responses import StreamingResponse, JSONResponse, HTMLResponse
from sqlalchemy import create_engine
from sqlalchemy.orm import sessionmaker
from Crypto.PublicKey import RSA
from Crypto.PublicKey.RSA import RsaKey
try:
# Crypto | Cryptodome on Debian
from Crypto.PublicKey import RSA
from Crypto.PublicKey.RSA import RsaKey
except ModuleNotFoundError:
from Cryptodome.PublicKey import RSA
from Cryptodome.PublicKey.RSA import RsaKey
from orm import Origin, Lease, init as db_init