summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/aes/aes_ecb.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/aes/aes_ecb.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/aes/aes_ecb.c')
-rw-r--r--src/lib/libcrypto/aes/aes_ecb.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/lib/libcrypto/aes/aes_ecb.c b/src/lib/libcrypto/aes/aes_ecb.c
index 976c48fdbc..b05e53994b 100644
--- a/src/lib/libcrypto/aes/aes_ecb.c
+++ b/src/lib/libcrypto/aes/aes_ecb.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: aes_ecb.c,v 1.5 2014/06/12 15:49:27 deraadt Exp $ */ 1/* $OpenBSD: aes_ecb.c,v 1.6 2015/02/10 09:46:30 miod Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -54,7 +54,6 @@
54# define NDEBUG 54# define NDEBUG
55# endif 55# endif
56#endif 56#endif
57#include <assert.h>
58 57
59#include <openssl/aes.h> 58#include <openssl/aes.h>
60#include "aes_locl.h" 59#include "aes_locl.h"
@@ -63,9 +62,6 @@ void
63AES_ecb_encrypt(const unsigned char *in, unsigned char *out, 62AES_ecb_encrypt(const unsigned char *in, unsigned char *out,
64 const AES_KEY *key, const int enc) 63 const AES_KEY *key, const int enc)
65{ 64{
66 assert(in && out && key);
67 assert((AES_ENCRYPT == enc) || (AES_DECRYPT == enc));
68
69 if (AES_ENCRYPT == enc) 65 if (AES_ENCRYPT == enc)
70 AES_encrypt(in, out, key); 66 AES_encrypt(in, out, key);
71 else 67 else