summaryrefslogtreecommitdiffstats
path: root/crypto/des/str2key.c
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-21 11:28:19 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-21 11:28:19 +0200
commitefee6f38c15c10f6f97ceb656f152a3997bebd0a (patch)
treedce6815e6b1e43d6b79f8134a24025e66c43e7f2 /crypto/des/str2key.c
parent5d8e636679ec928ea0c5f423c6c2645e724bc239 (diff)
parente92deaf08eb0ca9787492b40a6bd66e6357bfae7 (diff)
downloadreplicant_openssl-efee6f38c15c10f6f97ceb656f152a3997bebd0a.zip
replicant_openssl-efee6f38c15c10f6f97ceb656f152a3997bebd0a.tar.gz
replicant_openssl-efee6f38c15c10f6f97ceb656f152a3997bebd0a.tar.bz2
Merge remote-tracking branch 'github/cm-11.0'
Diffstat (limited to 'crypto/des/str2key.c')
-rw-r--r--crypto/des/str2key.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/des/str2key.c b/crypto/des/str2key.c
index 9c2054b..1077f99 100644
--- a/crypto/des/str2key.c
+++ b/crypto/des/str2key.c
@@ -56,8 +56,8 @@
* [including the GNU Public Licence.]
*/
-#include "des_locl.h"
#include <openssl/crypto.h>
+#include "des_locl.h"
void DES_string_to_key(const char *str, DES_cblock *key)
{