Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge ocicrypt contents into this project
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
- Loading branch information
1 parent
d8a6859
commit 0212339
Showing
35 changed files
with
1,559 additions
and
1,256 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,7 @@ | |
| all: build | ||
|
|
||
| build: | ||
| go build images/encryption/*.go | ||
| go build -v ./... | ||
|
|
||
| check: | ||
| golangci-lint run | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| /* | ||
| Copyright The containerd Authors. | ||
| 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. | ||
| */ | ||
|
|
||
| package blockcipher | ||
|
|
||
| import ( | ||
| "crypto/aes" | ||
| "crypto/cipher" | ||
| "crypto/hmac" | ||
| "crypto/rand" | ||
| "crypto/sha256" | ||
| "fmt" | ||
| "hash" | ||
| "io" | ||
|
|
||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| // AESCTRLayerBlockCipher implements the AES CTR stream cipher | ||
| type AESCTRLayerBlockCipher struct { | ||
| keylen int // in bytes | ||
| reader io.Reader | ||
| encrypt bool | ||
| stream cipher.Stream | ||
| err error | ||
| hmac hash.Hash | ||
| setHmac SetHmac | ||
| expHmac []byte | ||
| } | ||
|
|
||
| type aesctrcryptor struct { | ||
| bc *AESCTRLayerBlockCipher | ||
| outputReader io.Reader | ||
| } | ||
|
|
||
| // NewAESCTRLayerBlockCipher returns a new AES SIV block cipher of 256 or 512 bits | ||
| func NewAESCTRLayerBlockCipher(bits int) (LayerBlockCipher, error) { | ||
| if bits != 256 { | ||
| return nil, errors.New("AES CTR bit count not supported") | ||
| } | ||
| return &AESCTRLayerBlockCipher{keylen: bits / 8}, nil | ||
| } | ||
|
|
||
| func (r *aesctrcryptor) Read(p []byte) (int, error) { | ||
| var ( | ||
| o int | ||
| ) | ||
|
|
||
| if r.bc.err != nil { | ||
| return 0, r.bc.err | ||
| } | ||
|
|
||
| for o = 0; o < len(p); { | ||
| n, err := r.bc.reader.Read(p[o:]) | ||
| o += n | ||
| if err != nil { | ||
| if err == io.EOF { | ||
| r.bc.err = err | ||
| break | ||
| } else { | ||
| return 0, err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if !r.bc.encrypt { | ||
| if _, err := r.bc.hmac.Write(p[:o]); err != nil { | ||
| return 0, errors.Wrapf(err, "could not write to hmac") | ||
| } | ||
| if r.bc.err == io.EOF { | ||
| // Before we return EOF we let the HMAC comparison | ||
| // provide a verdict | ||
| if !hmac.Equal(r.bc.hmac.Sum(nil), r.bc.expHmac) { | ||
| return 0, fmt.Errorf("could not properly decrypt byte stream; exp hmac: '%x', actual hmac: '%s'", r.bc.expHmac, r.bc.hmac.Sum(nil)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| r.bc.stream.XORKeyStream(p[:o], p[:o]) | ||
|
|
||
| if r.bc.encrypt { | ||
| if _, err := r.bc.hmac.Write(p[:o]); err != nil { | ||
| return 0, errors.Wrapf(err, "could not write to hmac") | ||
| } | ||
| if r.bc.err == io.EOF { | ||
| // Final data encrypted; Do the 'then-MAC' part | ||
| r.bc.setHmac(r.bc.hmac.Sum(nil)) | ||
| } | ||
| } | ||
|
|
||
| return o, r.bc.err | ||
| } | ||
|
|
||
| // init initializes an instance | ||
| func (bc *AESCTRLayerBlockCipher) init(encrypt bool, reader io.Reader, opts LayerBlockCipherOptions, setHmac SetHmac, expHmac []byte) (LayerBlockCipherOptions, error) { | ||
| var ( | ||
| err error | ||
| ) | ||
|
|
||
| key := opts.SymmetricKey | ||
| if len(key) != bc.keylen { | ||
| return LayerBlockCipherOptions{}, fmt.Errorf("invalid key length of %d bytes; need %d bytes", len(key), bc.keylen) | ||
| } | ||
|
|
||
| nonce := opts.CipherOptions["nonce"] | ||
| if len(nonce) == 0 { | ||
| nonce = make([]byte, aes.BlockSize) | ||
| if _, err := io.ReadFull(rand.Reader, nonce); err != nil { | ||
| return LayerBlockCipherOptions{}, errors.Wrap(err, "unable to generate random nonce") | ||
| } | ||
| } | ||
|
|
||
| block, err := aes.NewCipher(key) | ||
| if err != nil { | ||
| return LayerBlockCipherOptions{}, errors.Wrap(err, "aes.NewCipher failed") | ||
| } | ||
|
|
||
| bc.reader = reader | ||
| bc.encrypt = encrypt | ||
| bc.stream = cipher.NewCTR(block, nonce) | ||
| bc.err = nil | ||
| bc.hmac = hmac.New(sha256.New, key) | ||
| bc.setHmac = setHmac | ||
| bc.expHmac = expHmac | ||
|
|
||
| lbco := LayerBlockCipherOptions{ | ||
| SymmetricKey: key, | ||
| CipherOptions: map[string][]byte{ | ||
| "nonce": nonce, | ||
| }, | ||
| } | ||
|
|
||
| return lbco, nil | ||
| } | ||
|
|
||
| // GenerateKey creates a synmmetric key | ||
| func (bc *AESCTRLayerBlockCipher) GenerateKey() ([]byte, error) { | ||
| key := make([]byte, bc.keylen) | ||
| if _, err := io.ReadFull(rand.Reader, key); err != nil { | ||
| return nil, err | ||
| } | ||
| return key, nil | ||
| } | ||
|
|
||
| // Encrypt takes in layer data and returns the ciphertext and relevant LayerBlockCipherOptions | ||
| func (bc *AESCTRLayerBlockCipher) Encrypt(plainDataReader io.Reader, opt LayerBlockCipherOptions, setHmac SetHmac) (io.Reader, LayerBlockCipherOptions, error) { | ||
| lbco, err := bc.init(true, plainDataReader, opt, setHmac, nil) | ||
| if err != nil { | ||
| return nil, LayerBlockCipherOptions{}, err | ||
| } | ||
|
|
||
| return &aesctrcryptor{bc, nil}, lbco, nil | ||
| } | ||
|
|
||
| // Decrypt takes in layer ciphertext data and returns the plaintext and relevant LayerBlockCipherOptions | ||
| func (bc *AESCTRLayerBlockCipher) Decrypt(encDataReader io.Reader, opt LayerBlockCipherOptions, expHmac []byte) (io.Reader, LayerBlockCipherOptions, error) { | ||
| lbco, err := bc.init(false, encDataReader, opt, nil, expHmac) | ||
| if err != nil { | ||
| return nil, LayerBlockCipherOptions{}, err | ||
| } | ||
|
|
||
| return &aesctrcryptor{bc, nil}, lbco, nil | ||
| } |
Oops, something went wrong.