summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbeck <>2017-01-26 12:07:06 +0000
committerbeck <>2017-01-26 12:07:06 +0000
commit10f32610e82e44521c0094ae91acbca090d36a58 (patch)
tree0187e5d2d2e59812507d004e1ef5249202e0faf2 /src
parent59161dbdf4da5b82b27402f93d7007a11b2d1cc1 (diff)
downloadopenbsd-10f32610e82e44521c0094ae91acbca090d36a58.tar.gz
openbsd-10f32610e82e44521c0094ae91acbca090d36a58.tar.bz2
openbsd-10f32610e82e44521c0094ae91acbca090d36a58.zip
Hide SSLerr() under #ifndef LIBRESSL_INTERNAL since we shouldn't be
using it anymore ok jsing@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/err/err.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h
index 87bb96eec7..f34db75d6f 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.22 2014/11/09 19:17:13 miod Exp $ */ 1/* $OpenBSD: err.h,v 1.23 2017/01/26 12:07:06 beck 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 *
@@ -213,7 +213,6 @@ typedef struct err_state_st {
213#define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),__FILE__,__LINE__) 213#define CONFerr(f,r) ERR_PUT_error(ERR_LIB_CONF,(f),(r),__FILE__,__LINE__)
214#define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),__FILE__,__LINE__) 214#define CRYPTOerr(f,r) ERR_PUT_error(ERR_LIB_CRYPTO,(f),(r),__FILE__,__LINE__)
215#define ECerr(f,r) ERR_PUT_error(ERR_LIB_EC,(f),(r),__FILE__,__LINE__) 215#define ECerr(f,r) ERR_PUT_error(ERR_LIB_EC,(f),(r),__FILE__,__LINE__)
216#define SSLerr(f,r) ERR_PUT_error(ERR_LIB_SSL,(f),(r),__FILE__,__LINE__)
217#define BIOerr(f,r) ERR_PUT_error(ERR_LIB_BIO,(f),(r),__FILE__,__LINE__) 216#define BIOerr(f,r) ERR_PUT_error(ERR_LIB_BIO,(f),(r),__FILE__,__LINE__)
218#define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),__FILE__,__LINE__) 217#define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),__FILE__,__LINE__)
219#define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),__FILE__,__LINE__) 218#define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),__FILE__,__LINE__)
@@ -233,6 +232,9 @@ typedef struct err_state_st {
233#define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__) 232#define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)
234#define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__) 233#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#define GOSTerr(f,r) ERR_PUT_error(ERR_LIB_GOST,(f),(r),__FILE__,__LINE__)
235#ifndef LIBRESSL_INTERNAL
236#define SSLerr(f,r) ERR_PUT_error(ERR_LIB_SSL,(f),(r),__FILE__,__LINE__)
237#endif
236 238
237#define ERR_PACK(l,f,r) (((((unsigned long)l)&0xffL)<<24L)| \ 239#define ERR_PACK(l,f,r) (((((unsigned long)l)&0xffL)<<24L)| \
238 ((((unsigned long)f)&0xfffL)<<12L)| \ 240 ((((unsigned long)f)&0xfffL)<<12L)| \