aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorlloyd <[email protected]>2013-03-27 16:57:59 +0000
committerlloyd <[email protected]>2013-03-27 16:57:59 +0000
commit4d69a574d050e010fdc1792ea0c8020bc1a5f55c (patch)
treee356db2f929f59c00fc7739641eb30d7de262fda /src/engine
parent3bf1f1321c3c78c499d7e44c9fb2ca97b927f5a1 (diff)
parent11c7544fe0576571f01973c8861a068895aa8c87 (diff)
propagate from branch 'net.randombit.botan' (head b7ac11f48ca4fe8e5aafa01979c5bf087b156d77)
to branch 'net.randombit.botan.aead-modes' (head 061b249cd586d4ff849aaa48c3ec8cf7587acc56)
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/aes_isa_eng/aes_isa_engine.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/aes_isa_eng/aes_isa_engine.cpp b/src/engine/aes_isa_eng/aes_isa_engine.cpp
index e56f6e9ca..956a1ce38 100644
--- a/src/engine/aes_isa_eng/aes_isa_engine.cpp
+++ b/src/engine/aes_isa_eng/aes_isa_engine.cpp
@@ -30,7 +30,7 @@ AES_ISA_Engine::find_block_cipher(const SCAN_Name& request,
}
#endif
- return 0;
+ return nullptr;
}
}