1
0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00

Merge branch 'develop' into develop-2.5

This commit is contained in:
Jeremy Stretch
2018-11-12 16:03:52 -05:00
18 changed files with 195 additions and 81 deletions

View File

@@ -1,3 +1,5 @@
import string
from Crypto.PublicKey import RSA
from django.conf import settings
from django.contrib.auth.models import User
@@ -86,7 +88,7 @@ class SecretTestCase(TestCase):
"""
Test basic encryption and decryption functionality using a random master key.
"""
plaintext = "FooBar123"
plaintext = string.printable * 2
secret_key = generate_random_key()
s = Secret(plaintext=plaintext)
s.encrypt(secret_key)