diff options
author | miod <> | 2014-11-18 05:33:43 +0000 |
---|---|---|
committer | miod <> | 2014-11-18 05:33:43 +0000 |
commit | 0c986de0d047d74ccf3708c551b93f60ed6bfafb (patch) | |
tree | 1ff6097d67d8f3a7af1e40761e736566bcd71b7d /src/lib/libssl/ssl.h | |
parent | 9555aff2e872287755e956f3b44930bf7de0cdda (diff) | |
download | openbsd-0c986de0d047d74ccf3708c551b93f60ed6bfafb.tar.gz openbsd-0c986de0d047d74ccf3708c551b93f60ed6bfafb.tar.bz2 openbsd-0c986de0d047d74ccf3708c551b93f60ed6bfafb.zip |
Update the GOST code in libssl, as contributed by Dmitry Eremin-Solenikov.
This causes a libssl major version bump as this affects the layout of some
internal-but-unfortunately-made-visible structs.
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 00a4b5e39b..2416b46d46 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.71 2014/11/16 14:12:47 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.72 2014/11/18 05:33:43 miod Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -295,6 +295,8 @@ extern "C" { | |||
295 | #define SSL_TXT_GOST89MAC "GOST89MAC" | 295 | #define SSL_TXT_GOST89MAC "GOST89MAC" |
296 | #define SSL_TXT_SHA256 "SHA256" | 296 | #define SSL_TXT_SHA256 "SHA256" |
297 | #define SSL_TXT_SHA384 "SHA384" | 297 | #define SSL_TXT_SHA384 "SHA384" |
298 | #define SSL_TXT_STREEBOG256 "STREEBOG256" | ||
299 | #define SSL_TXT_STREEBOG512 "STREEBOG512" | ||
298 | 300 | ||
299 | #define SSL_TXT_DTLS1 "DTLSv1" | 301 | #define SSL_TXT_DTLS1 "DTLSv1" |
300 | #define SSL_TXT_DTLS1_BAD "DTLSv1-bad" | 302 | #define SSL_TXT_DTLS1_BAD "DTLSv1-bad" |