diff options
| author | Don Anderson <dda@ddanderson.com> | 2015-05-05 10:33:24 -0400 |
|---|---|---|
| committer | Don Anderson <dda@ddanderson.com> | 2015-05-05 10:35:42 -0400 |
| commit | c48d5f94c7577a28e01f0612c50d6e5d3bc5fb07 (patch) | |
| tree | 3acbf17c34f85dbe4345b561489b8b965abe42a7 /ext | |
| parent | 9c37aa4ea3e61ad0be2fbd91b701559cd0758fef (diff) | |
| download | mongo-c48d5f94c7577a28e01f0612c50d6e5d3bc5fb07.tar.gz | |
In rotn, remove unneeded checks and fixed return value for presize(). WT-1822.
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/encryptors/rotn/rotn_encrypt.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ext/encryptors/rotn/rotn_encrypt.c b/ext/encryptors/rotn/rotn_encrypt.c index e6d7dc0e0b1..12e1f98bf64 100644 --- a/ext/encryptors/rotn/rotn_encrypt.c +++ b/ext/encryptors/rotn/rotn_encrypt.c @@ -171,8 +171,6 @@ rotn_encrypt(WT_ENCRYPTOR *encryptor, WT_SESSION *session, (void)session; /* Unused */ - if (src == NULL) - return (0); if (dst_len < src_len + CHKSUM_LEN + IV_LEN) return (ENOMEM); @@ -222,8 +220,6 @@ rotn_decrypt(WT_ENCRYPTOR *encryptor, WT_SESSION *session, (void)session; /* Unused */ - if (src == NULL) - return (0); /* * Make sure it is big enough. */ @@ -374,7 +370,7 @@ err: free(rotn_encryptor->keyid); free(rotn_encryptor->shift_forw); free(rotn_encryptor->shift_back); free(rotn_encryptor); - return (EPERM); + return (ret); } /*! [WT_ENCRYPTOR presize] */ |