From 9367fc7916e35f66272dbc483348265c31bf6372 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Sun, 17 Mar 2019 17:46:00 +0000
Subject: Add the SM4 block cipher from the Chinese standard GB/T 32907-2016.

Patch from Daniel Wyatt
ok inoguchi, jsing
---
 src/usr.bin/openssl/openssl.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c
index 92ecb1db3b..dbd15c80a8 100644
--- a/src/usr.bin/openssl/openssl.c
+++ b/src/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openssl.c,v 1.28 2018/11/11 07:10:57 tb Exp $ */
+/* $OpenBSD: openssl.c,v 1.29 2019/03/17 17:46:00 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -322,6 +322,13 @@ FUNCTION functions[] = {
 	{ FUNC_TYPE_CIPHER, "rc4", enc_main },
 	{ FUNC_TYPE_CIPHER, "rc4-40", enc_main },
 #endif
+#ifndef OPENSSL_NO_SM4
+	{ FUNC_TYPE_CIPHER, "sm4", enc_main },
+	{ FUNC_TYPE_CIPHER, "sm4-ecb", enc_main },
+	{ FUNC_TYPE_CIPHER, "sm4-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "sm4-ofb", enc_main },
+	{ FUNC_TYPE_CIPHER, "sm4-cfb", enc_main },
+#endif
 #ifdef ZLIB
 	{ FUNC_TYPE_CIPHER, "zlib", enc_main },
 #endif
-- 
cgit v1.2.3-55-g6feb