summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/err/err.h
diff options
context:
space:
mode:
authormiod <>2014-11-09 19:17:13 +0000
committermiod <>2014-11-09 19:17:13 +0000
commit12455d6eff265f95b0a7e20595630321799f50a2 (patch)
tree8f4747a1df4b007feca32e262b38052339c686c1 /src/lib/libcrypto/err/err.h
parenta3c50c7d270773c83559454fd2b75ec6e04f43ab (diff)
downloadopenbsd-12455d6eff265f95b0a7e20595630321799f50a2.tar.gz
openbsd-12455d6eff265f95b0a7e20595630321799f50a2.tar.bz2
openbsd-12455d6eff265f95b0a7e20595630321799f50a2.zip
GOST crypto algorithms (well, most of them), ported from the removed GOST
engine to regular EVP citizens, contributed by Dmitry Eremin-Solenikov; libcrypto bits only for now. This is a verbatim import of Dmitry's work, and does not compile in this state; the forthcoming commits will address these issues. None of the GOST code is enabled in libcrypto yet, for it still gets compiled with OPENSSL_NO_GOST defined. However, the public header gost.h will be installed.
Diffstat (limited to 'src/lib/libcrypto/err/err.h')
-rw-r--r--src/lib/libcrypto/err/err.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h
index ced340ea80..87bb96eec7 100644
--- a/src/lib/libcrypto/err/err.h
+++ b/src/lib/libcrypto/err/err.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: err.h,v 1.21 2014/07/11 09:25:24 jsing Exp $ */ 1/* $OpenBSD: err.h,v 1.22 2014/11/09 19:17:13 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 *
@@ -195,6 +195,7 @@ typedef struct err_state_st {
195#define ERR_LIB_TS 47 195#define ERR_LIB_TS 47
196#define ERR_LIB_HMAC 48 196#define ERR_LIB_HMAC 48
197#define ERR_LIB_JPAKE 49 197#define ERR_LIB_JPAKE 49
198#define ERR_LIB_GOST 50
198 199
199#define ERR_LIB_USER 128 200#define ERR_LIB_USER 128
200 201
@@ -231,6 +232,7 @@ typedef struct err_state_st {
231#define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__) 232#define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__)
232#define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__) 233#define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)
233#define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__) 234#define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__)
235#define GOSTerr(f,r) ERR_PUT_error(ERR_LIB_GOST,(f),(r),__FILE__,__LINE__)
234 236
235#define ERR_PACK(l,f,r) (((((unsigned long)l)&0xffL)<<24L)| \ 237#define ERR_PACK(l,f,r) (((((unsigned long)l)&0xffL)<<24L)| \
236 ((((unsigned long)f)&0xfffL)<<12L)| \ 238 ((((unsigned long)f)&0xfffL)<<12L)| \