valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Initial commit for the table package, a generic backend for crypto

Browse Source 
this is still EXPERIMENTAL!! Not yet used in salt and is under heavy
development
This commit is contained in:
Thomas S Hatch 2014-02-03 17:16:57 -07:00
parent 3a894d7606
commit d9063c69dd
13 changed files with 1009 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
salt/transport/table/.gitignore vendored Normal file
View File

@ -0,0 +1,52 @@
/build
*.py[co]
*.swp
doc/_build
dist
MANIFEST
*~
*#
*.wpr
*.wpu
*.DS_Store
# virtualenv
# - ignores directories of a virtualenv when you create it right on
# top of salt such as
# - /some/path$ git clone https://github.com/thatch45/salt.git
# - /some/path$ virtualenv --python=/usr/bin/python2.6 salt
bin/
include/
lib/
pip/
share/
tests/integration/tmp/
# tox - ignore any tox-created virtualenv dirs
.tox
# setuptools stuff
*.egg-info
# code coverage outputs genereated by coverage.py
.coverage
coverage.xml
htmlcov/
# IDE files
/.project
/.pydevproject
/.idea
/.ropeproject
# ignore ctags file
tags
# ignore Vagrant file
Vagrantfile
.vagrant
# Compiled translation files should not be VCS'ed
# locale/zh_CN/LC_MESSAGES/topics/virt/nic.mo
*.mo
.doctrees

202
salt/transport/table/LICENSE Normal file
View File

@ -0,0 +1,202 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright 2014 Thomas S Hatch
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

43
salt/transport/table/README.rst Normal file
View File

@ -0,0 +1,43 @@
The Table Cryptographic Normalization System
============================================
.. note::
This library is currently experimental, no security claims are yet present
and is still undergoing extensive evaluation and heavy development
The idea is very simple, a single interface that simplifies cryptographic
routines to make complex libraries easy and safe to use.
Unified API
-----------
Table delivers a unified API, where the same commands can access different
cryptographic routines. This allows for backend routines to be easily swapped
in and out as time moves forward and the race for cryptographic security
continues.
Cryptographic Backends
----------------------
Backends are simplified, instead of large numbers of groups backends are
simplified into `public` for public key encryption, and `secret` for symmetric
encryption.
No Cryptographic Code
---------------------
This library has no cryptographic code, it only uses established and accepted
backend libraries to deliver simplified cryptographic routines.
Currently Available Public Key Backends
---------------------------------------
Curve 25519 via pynacl and libsodium
RSA via pycrypto and openssl
Currently Available Symmetric Backends
--------------------------------------
Salsa20 via pynacl and libsodium
AES via pycrypto and openssl

54
salt/transport/table/setup.py Executable file
View File

@ -0,0 +1,54 @@
#!/usr/bin/env python
'''
The setup script table
'''
import os
# Use setuptools only if the user opts-in by setting the USE_SETUPTOOLS env var
# This ensures consistent behavior but allows for advanced usage with
# virtualenv, buildout, and others.
USE_SETUPTOOLS = False
if 'USE_SETUPTOOLS' in os.environ:
try:
from setuptools import setup
USE_SETUPTOOLS = True
except:
USE_SETUPTOOLS = False
if USE_SETUPTOOLS is False:
from distutils.core import setup
NAME = 'table'
DESC = ('An multi backend crypto abstraction system')
VERSION = '0.1.0'
kwargs = {}
kwargs.update(
name=NAME,
version=VERSION,
description=DESC,
author='Thomas S Hatch',
author_email='thatch45@gmail.com',
url='http://red45.org',
classifiers=[
'Programming Language :: Python',
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Development Status :: 1 - Planning',
'License :: OSI Approved :: Apache Software License',
'Operating System :: POSIX :: Linux',
],
packages=[
'table',
'table.public',
'table.secret'],
)
if USE_SETUPTOOLS:
kwargs.update(
install_requires=open('requirements.txt').readlines(),
)
setup(**kwargs)

214
salt/transport/table/table/__init__.py Normal file
View File

@ -0,0 +1,214 @@
'''
Bring the cryptography to the table. This package aims to make a single very
high level cryptographic interface which abstracts many underlying algorithms.
The keys all contain a "keydata" dict, the following keydata keys MUST be in
the underlying keydata dict from the backend:
ctime: Timestamp
'''
# Import Salt libs
import salt.utils
# Import python libs
import os
import json
import datetime
# Try to import serialization libs
try:
import msgpack
HAS_MSGPACK = True
except ImportError:
HAS_MSGPACK = False
def now():
'''
Return now as a date list
'''
return date_to_list(datetime.datetime.now())
def list_to_date(date):
'''
Convert a list to a datetime
'''
return datetime.datetime(*date)
def date_to_list(date):
'''
Convert a datetime object into a list
'''
return [date.year,
date.month,
date.day,
date.hour,
date.minute,
date.second]
def _gather_backend(backend, sec_backend=None):
'''
Return the table object which abstracts the backend's functionality
'''
pubname = 'salt.transport.table.public.{0}'.format(backend)
pubmod = __import__(pubname)
pubmod = getattr(pubmod.public, backend)
if sec_backend is None:
sec_backend = pubmod.SEC_BACKEND
secname = 'salt.transport.table.secret.{0}'.format(sec_backend)
secmod = __import__(secname)
secmod = getattr(secmod.secret, sec_backend)
return (pubmod,
secmod)
class Serial(object):
'''
Serialization normalizing class
'''
def __init__(self, serial):
self.serial = serial
def loads(self, data):
'''
Load the serialized data from the string passed in
'''
return {'msgpack': self.loads_msgpack,
'json': self.loads_json}[self.serial](data)
def dumps(self, data):
'''
Dump a data structure
'''
return {'msgpack': self.dumps_msgpack,
'json': self.dumps_json}[self.serial](data)
def loads_msgpack(self, data):
'''
Load msgpack serialized string
'''
return msgpack.loads(data)
def loads_json(self, data):
'''
Load JSON string
'''
return json.loads(data, object_hook=salt.utils.decode_dict)
def dumps_msgpack(self, data):
'''
Dump msgpack serialized string
'''
return msgpack.dumps(data)
def dumps_json(self, data):
'''
Dump JSON string
'''
return json.dumps(data)
class Public(object):
'''
Returns a public key interface
'''
def __init__(
self,
backend='pynacl',
keydata=None,
keyfile=None,
keyfile_secret=None,
serial='json',
sec_backend=None,
**kwargs):
self.serial = Serial(serial)
self.kwargs = kwargs
self.backend = backend
self.public, self.secret = _gather_backend(backend, sec_backend)
self._key = self.__generate(keydata, keyfile, keyfile_secret)
self.keydata = self._key.keydata
if sec_backend is None:
self.sec_backend = self.public.SEC_BACKEND
else:
self.sec_backend = sec_backend
def __generate(self, keydata, keyfile, keyfile_secret):
'''
Return the key from the keyfile, or generate a new key
'''
if keydata:
return self.public.Key(keydata)
if keyfile:
if os.path.isfile(keyfile):
# Keyfiles are small, read it all in
with open(keyfile, 'r') as fp_:
keydata = fp_.read()
if keyfile_secret:
file_key = self.secret.Key(keyfile_secret)
keydata = file_key.decrypt(keydata, keyfile_secret)
keydata = self.serial.loads(keydata)
else:
raise ValueError('Keyfile {0} Not Found'.format(keyfile))
return self.public.Key(keydata)
return self.public.Key(None, **self.kwargs)
def save(self, path):
'''
Save the serialized keydata to the given path
'''
current = os.umask(191)
with open(path, 'w+') as fp_:
fp_.write(self.serial.dumps(self._key.keydata))
os.umask(current)
def encrypt(self, pub, msg):
'''
Pass in the remote target's public key object, and the data to
encrypt, an encrypted string will be returned
'''
return self._key.encrypt(pub, msg)
def decrypt(self, pub, msg):
'''
Pass in the remote reciever's public key object and the data to
decrypt, an encrypted string will be returned
'''
return self._key.decrypt(pub, msg)
def sign(self, msg):
'''
Return a signature for the given data
'''
return self._key.sign(msg)
def verify(self, signed):
'''
Verify that the signed message is valid
'''
return self._key.verify(signed)
class Secret(object):
'''
Returns a secret object, used to encrypt and decrypt secret messages
'''
# TODO: Make a generator to encrypt messages in chains so we can load blocks
# into memory
def __init__(self, backend='pynacl', key=None):
self.public, self.secret = _gather_backend(backend)
self._key = self.secret.Key(key)
def encrypt(self, msg):
'''
Encrypt the data using the given key
'''
return self._key.encrypt(msg)
def decrypt(self, msg):
'''
Decrypt the data using the given key
'''
return self._key.decrypt(msg)

4
salt/transport/table/table/handshake/__init__.py Normal file
View File

@ -0,0 +1,4 @@
'''
Package containing network handshakes
'''

51
salt/transport/table/table/handshake/raet_curvecp.py Normal file
View File

@ -0,0 +1,51 @@
'''
This handshake is based on the curvecp handshake, btu it modified to function
with the UDP/TCP RAET. This modification revolves primarily around the fact
that RAET has a more flexible header and cleartext idenity tracking is
simplified.
This handshake only supports the pynacl backend
'''
# Import table libs
import table
class Curve(object):
'''
The main class containing the basic routines fo the curve handshake
'''
def __init__(self, local, remote):
'''
Pass in a public key
'''
self.local = local
self.remote = remote
self.local_prime = table.Public()
self.stage = 'new'
def make_hello(self):
'''
Create a hello message
'''
ret = {}
ret['C`'] = self.local_prime.keydata['pub']
ret['box'] = self.local_prime.encrypt(self.remote, '0')
return ret
def verify_hello(self, hello):
'''
Verify hello packet
'''
if 'C`' not in hello or 'pub' not in hello:
return False
self.local_prime.decrypt(self.remote, hello['box'])
self.remote_prime = table.Public({'pub': hello['C`']})
self.stage = 'remote_prime'
return True
def make_cookie(self):
'''
Make the cookie
'''

3
salt/transport/table/table/public/__init__.py Normal file
View File

@ -0,0 +1,3 @@
'''
Package used to contain public key cryptography sequences
'''

147
salt/transport/table/table/public/pycrypto_rsa.py Normal file
View File

@ -0,0 +1,147 @@
'''
Manage RSA encryption via pycrypto
The keydata consists of the following:
pub: PEM encoded public key
priv: PEM encoded private key
'''
SEC_BACKEND = 'pycrypto_aes'
# Import pycrypto libs
from Crypto.Cipher import PKCS1_OAEP
from Crypto.PublicKey import RSA
from Crypto.Signature import PKCS1_PSS
from Crypto.Hash import SHA
import Crypto.Util.number
# Import table libs
import salt.transport.table
class Key(object):
'''
The management interface for rsa keys
'''
def __init__(self, keydata=None, **kwargs):
self.kwargs = kwargs
self.__generate(keydata)
def __generate(self, keydata):
'''
Generate the pycrypto rsa object
'''
if keydata:
if 'components' not in keydata:
raise ValueError('Invalid keydata, no components')
key = RSA.construct(keydata['components'])
if key.has_private():
self.priv = key
self.pub = key.publickey()
self.sign_key = PKCS1_PSS.new(self.priv)
self.verify_key = PKCS1_PSS.new(self.pub)
self.decrypter = PKCS1_OAEP.new(self.priv)
else:
self.pub = key
self.verify_key = PKCS1_PSS.new(self.pub)
self.keydata = keydata
else:
self.priv = self._gen_key()
self.pub = self.priv.publickey()
self.sign_key = PKCS1_PSS.new(self.priv)
self.verify_key = PKCS1_PSS.new(self.pub)
self.keydata = self._gen_keydata(self.priv)
self.decrypter = PKCS1_OAEP.new(self.priv)
self.encrypter = PKCS1_OAEP.new(self.pub)
self.max_msg_size = self.get_max_msg_size()
self.enc_chunk_size = self.get_enc_chunk_size()
def _gen_keydata(self, key):
'''
Return the keydata of a given key
'''
keydata = {'components': []}
for attr in key.keydata:
keydata['components'].append(getattr(key, attr))
keydata['ctime'] = salt.transport.table.now()
return keydata
def _gen_key(self):
'''
Generate an RSA key, ensure that it is no smaller than 2048 bits
'''
size = self.kwargs.get('size', 2048)
if size < 2048:
raise ValueError('Key size too small')
return RSA.generate(size)
def _string_chunks(self, msg, size, i=None):
'''
Yield the message in the sized chunks
'''
if i is None:
i = 0
msg_len = len(msg)
while i < msg_len:
top = i + size
if top > msg_len:
top = msg_len
yield msg[i:top]
i = top
def get_max_msg_size(self):
'''
Return the max size of a message chunk
'''
return (Crypto.Util.number.size(self.pub.n) / 8) -2 - (SHA.digest_size * 2)
def get_enc_chunk_size(self):
'''
Return the size of all encrypted chunks
'''
return Crypto.Util.number.size(self.pub.n) / 8
def encrypt(self, pub, msg):
'''
Sign and encrypt a message
'''
ret = ''
hash_ = SHA.new()
hash_.update(msg)
ret += self.sign_key.sign(hash_)
for chunk in self._string_chunks(msg, pub._key.max_msg_size):
ret += pub._key.encrypter.encrypt(chunk)
return ret
def decrypt(self, pub, msg):
'''
Decrypt the given message against the given public key
'''
c_size = pub._key.get_enc_chunk_size()
sig = msg[0:c_size]
clear = ''
for chunk in self._string_chunks(msg, c_size, c_size):
clear += self.decrypter.decrypt(chunk)
return pub._key.verify(sig + clear)
def sign(self, msg):
'''
Sign a message
'''
hash_ = SHA.new()
hash_.update(msg)
sig = self.sign_key.sign(hash_)
return sig + msg
def verify(self, msg):
'''
Verify a message
'''
sig = msg[0:self.enc_chunk_size]
msg = msg[self.enc_chunk_size:]
hash_ = SHA.new()
hash_.update(msg)
if self.verify_key.verify(hash_, sig):
return msg
return False

113
salt/transport/table/table/public/pynacl.py Normal file
View File

@ -0,0 +1,113 @@
'''
Manage encryption with the pynacl bindings to libsodium
The keydata consists of the following:
priv: <HEX private keys>
pub: <HEX public key>
sign: <HEX signing key>
verify: <HEX verify key>
'''
SEC_BACKEND = 'pynacl'
# Import table libs
import salt.transport.table
# Import Cyptographic libs
import nacl.public
import nacl.signing
import nacl.encoding
# Import python libs
import time
class Key(object):
'''
Used to manage high level nacl operations
'''
def __init__(self, keydata=None, **kwargs):
self.kwargs = kwargs
self.__generate(keydata)
def __generate(self, keydata):
'''
Build the key objects, if the keydata is present load the objects from
said keys, otherwise generate a full set of keys
'''
if keydata:
if 'priv' in keydata:
self.priv = nacl.public.PrivateKey(
keydata['priv'],
nacl.encoding.HexEncoder)
self.pub = self.priv.public_key
elif 'pub' in keydata:
self.pub = nacl.public.PublicKey(
keydata['pub'],
nacl.encoding.HexEncoder)
else:
self.priv = nacl.public.PrivateKey.generate()
self.pub = self.priv.public_key
if 'sign' in keydata:
self.sign_key = nacl.signing.SigningKey(
keydata['sign'],
nacl.encoding.HexEncoder)
self.verify_key = self.sign_key.verify_key
elif 'verify' in keydata:
self.verify = nacl.signing.VerifyKey(
keydata['verify'],
nacl.encoding.HexEncoder)
self.keydata = keydata
else:
self.keydata = {}
self.priv = nacl.public.PrivateKey.generate()
self.keydata['priv'] = self.priv.encode(nacl.encoding.HexEncoder)
self.pub = self.priv.public_key
self.keydata['pub'] = self.pub.encode(nacl.encoding.HexEncoder)
self.sign_key = nacl.signing.SigningKey.generate()
self.keydata['sign'] = self.sign_key.encode(nacl.encoding.HexEncoder)
self.verify_key = self.sign_key.verify_key
self.keydata['verify'] = self.verify_key.encode(nacl.encoding.HexEncoder)
self.keydata['ctime'] = salt.transport.table.now()
def _safe_nonce(self):
'''
Generate a safe nonce value (safe assuming only this method is used to
create nonce values)
'''
now = str(time.time() * 1000000)
nonce = '{0}{1}'.format(
nacl.utils.random(nacl.secret.SecretBox.NONCE_SIZE - len(now)),
now)
return nonce
def encrypt(self, pub, msg):
'''
Encrypt the message intended for the owner of the passed in pubic key
'''
box = nacl.public.Box(self.priv, pub._key.pub)
nonce = self._safe_nonce()
return box.encrypt(msg, nonce)
def decrypt(self, pub, msg):
'''
Decrypt a message from the given pub intended for this private key
'''
box = nacl.public.Box(self.priv, pub._key.pub)
return box.decrypt(msg)
def sign(self, msg):
'''
Sign the message
'''
return self.sign_key.sign(msg)
def verify(self, msg):
'''
Verify the message
'''
try:
return self.verify_key.verify(msg)
except nacl.signing.BadSignatureError:
return False

3
salt/transport/table/table/secret/__init__.py Normal file
View File

@ -0,0 +1,3 @@
'''
Sync encryption normalization
'''

74
salt/transport/table/table/secret/pycrypto_aes.py Normal file
View File

@ -0,0 +1,74 @@
'''
table backend for aes using pycrypto
'''
# Import pycrypto libs
from Crypto.Cipher import AES
# Import python libs
import hashlib
import hmac
import os
class Key(object):
'''
Authenticated encryption class
Encryption algorithm: AES-CBC
Signing algorithm: HMAC-SHA256
'''
AES_BLOCK_SIZE = 16
SIG_SIZE = hashlib.sha256().digest_size
def __init__(self, key=None, size=128, **kwargs):
self.kwargs = kwargs
if key is None:
key = self.generate_key_string(size)
self.keys = self.extract_keys(key, size)
self.key_size = size
@classmethod
def generate_key_string(cls, key_size=128):
key = os.urandom(key_size // 8 + cls.SIG_SIZE)
return key.encode('base64').replace('\n', '')
@classmethod
def extract_keys(cls, key_string, key_size):
key = key_string.decode('base64')
assert len(key) == key_size / 8 + cls.SIG_SIZE, 'invalid key'
return key[:-cls.SIG_SIZE], key[-cls.SIG_SIZE:]
def encrypt(self, msg):
'''
encrypt data with AES-CBC and sign it with HMAC-SHA256
'''
aes_key, hmac_key = self.keys
pad = self.AES_BLOCK_SIZE - len(msg) % self.AES_BLOCK_SIZE
data = msg + pad * chr(pad)
iv_bytes = os.urandom(self.AES_BLOCK_SIZE)
cypher = AES.new(aes_key, AES.MODE_CBC, iv_bytes)
data = iv_bytes + cypher.encrypt(data)
sig = hmac.new(hmac_key, data, hashlib.sha256).digest()
return data + sig
def decrypt(self, msg):
'''
verify HMAC-SHA256 signature and decrypt data with AES-CBC
'''
aes_key, hmac_key = self.keys
sig = msg[-self.SIG_SIZE:]
data = msg[:-self.SIG_SIZE]
mac_bytes = hmac.new(hmac_key, data, hashlib.sha256).digest()
if len(mac_bytes) != len(sig):
raise ValueError('message authentication failed')
result = 0
for zipped_x, zipped_y in zip(mac_bytes, sig):
result |= ord(zipped_x) ^ ord(zipped_y)
if result != 0:
raise ValueError('message authentication failed')
iv_bytes = data[:self.AES_BLOCK_SIZE]
data = data[self.AES_BLOCK_SIZE:]
cypher = AES.new(aes_key, AES.MODE_CBC, iv_bytes)
data = cypher.decrypt(data)
return data[:-ord(data[-1])]

49
salt/transport/table/table/secret/pynacl.py Normal file
View File

@ -0,0 +1,49 @@
'''
pynacl secret key encryption
'''
# Import python libs
import time
# Import cryptographic libs
import nacl.secret
import nacl.utils
class Key(object):
'''
Maintain a salsa20 key
'''
def __init__(self, key=None, size=None, **kwargs):
if key is None:
if size is None or size < 32:
size = nacl.secret.SecretBox.KEY_SIZE
key = nacl.utils.random(size)
if len(key) < 32:
raise ValueError('Keysize is too small')
self.key = key
self.box = nacl.secret.SecretBox(key)
def _safe_nonce(self):
'''
Generate a safe nonce value (safe assuming only this method is used to
create nonce values)
'''
now = str(time.time() * 1000000)
nonce = '{0}{1}'.format(
nacl.utils.random(nacl.secret.SecretBox.NONCE_SIZE - len(now)),
now)
return nonce
def encrypt(self, msg):
'''
Using the given key, encrypt a message
'''
nonce = self._safe_nonce()
return self.box.encrypt(msg, nonce)
def decrypt(self, msg):
'''
Using the given key, decrypt a message
'''
return self.box.decrypt(msg)