summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/modes/cfb128.c
diff options
context:
space:
mode:
authormiod <>2015-02-10 09:46:30 +0000
committermiod <>2015-02-10 09:46:30 +0000
commitc54f1e6efb3beda80d415ba75614cbc695f799be (patch)
tree8bb4657eb5417a2a0ea6710585ef13aa7b25433c /src/lib/libcrypto/modes/cfb128.c
parentbedef42af36243e74221aa77e809718c15fae035 (diff)
downloadopenbsd-c54f1e6efb3beda80d415ba75614cbc695f799be.tar.gz
openbsd-c54f1e6efb3beda80d415ba75614cbc695f799be.tar.bz2
openbsd-c54f1e6efb3beda80d415ba75614cbc695f799be.zip
Remove assert() or OPENSSL_assert() of pointers being non-NULL. The policy
for libraries in OpenBSD is to deliberately let NULL pointers cause a SIGSEGV. ok doug@ jsing@
Diffstat (limited to 'src/lib/libcrypto/modes/cfb128.c')
-rw-r--r--src/lib/libcrypto/modes/cfb128.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/lib/libcrypto/modes/cfb128.c b/src/lib/libcrypto/modes/cfb128.c
index 593c337e8b..8399f0c5be 100644
--- a/src/lib/libcrypto/modes/cfb128.c
+++ b/src/lib/libcrypto/modes/cfb128.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cfb128.c,v 1.3 2014/06/12 15:49:30 deraadt Exp $ */ 1/* $OpenBSD: cfb128.c,v 1.4 2015/02/10 09:46:30 miod Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 2008 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 2008 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -58,7 +58,6 @@
58# define NDEBUG 58# define NDEBUG
59# endif 59# endif
60#endif 60#endif
61#include <assert.h>
62 61
63/* The input and output encrypted as though 128bit cfb mode is being 62/* The input and output encrypted as though 128bit cfb mode is being
64 * used. The extra state information to record how much of the 63 * used. The extra state information to record how much of the
@@ -72,8 +71,6 @@ void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
72 unsigned int n; 71 unsigned int n;
73 size_t l = 0; 72 size_t l = 0;
74 73
75 assert(in && out && key && ivec && num);
76
77 n = *num; 74 n = *num;
78 75
79 if (enc) { 76 if (enc) {
@@ -215,9 +212,6 @@ void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out,
215 size_t n; 212 size_t n;
216 unsigned char c[1],d[1]; 213 unsigned char c[1],d[1];
217 214
218 assert(in && out && key && ivec && num);
219 assert(*num == 0);
220
221 for(n=0 ; n<bits ; ++n) 215 for(n=0 ; n<bits ; ++n)
222 { 216 {
223 c[0]=(in[n/8]&(1 << (7-n%8))) ? 0x80 : 0; 217 c[0]=(in[n/8]&(1 << (7-n%8))) ? 0x80 : 0;
@@ -234,9 +228,6 @@ void CRYPTO_cfb128_8_encrypt(const unsigned char *in, unsigned char *out,
234{ 228{
235 size_t n; 229 size_t n;
236 230
237 assert(in && out && key && ivec && num);
238 assert(*num == 0);
239
240 for(n=0 ; n<length ; ++n) 231 for(n=0 ; n<length ; ++n)
241 cfbr_encrypt_block(&in[n],&out[n],8,key,ivec,enc,block); 232 cfbr_encrypt_block(&in[n],&out[n],8,key,ivec,enc,block);
242} 233}