diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/err/err.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libcrypto/err/err.h b/lib/libcrypto/err/err.h index 87bb96eec75..f34db75d6f2 100644 --- a/lib/libcrypto/err/err.h +++ b/lib/libcrypto/err/err.h @@ -1,4 +1,4 @@ -/* $OpenBSD: err.h,v 1.22 2014/11/09 19:17:13 miod Exp $ */ +/* $OpenBSD: err.h,v 1.23 2017/01/26 12:07:06 beck Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -213,7 +213,6 @@ typedef struct err_state_st { #define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),__FILE__,__LINE__) #define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),__FILE__,__LINE__) #define ECerr(f,r) ERR_PUT_error(ERR_LIB_EC,(f),(r),__FILE__,__LINE__) -#define SSLerr(f,r) ERR_PUT_error(ERR_LIB_SSL,(f),(r),__FILE__,__LINE__) #define BIOerr(f,r) ERR_PUT_error(ERR_LIB_BIO,(f),(r),__FILE__,__LINE__) #define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),__FILE__,__LINE__) #define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),__FILE__,__LINE__) @@ -233,6 +232,9 @@ typedef struct err_state_st { #define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__) #define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__) #define GOSTerr(f,r) ERR_PUT_error(ERR_LIB_GOST,(f),(r),__FILE__,__LINE__) +#ifndef LIBRESSL_INTERNAL +#define SSLerr(f,r) ERR_PUT_error(ERR_LIB_SSL,(f),(r),__FILE__,__LINE__) +#endif #define ERR_PACK(l,f,r) (((((unsigned long)l)&0xffL)<<24L)| \ ((((unsigned long)f)&0xfffL)<<12L)| \ |