diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libcrypto/err/err.h | 8 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/err/err.h | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h index 9eb1158e75..fc2f1a4eaf 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.18 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: err.h,v 1.19 2014/07/08 11:11:57 jsing 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 | * |
| @@ -232,10 +232,8 @@ typedef struct err_state_st { | |||
| 232 | #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__) |
| 233 | #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__) |
| 234 | 234 | ||
| 235 | /* Borland C seems too stupid to be able to shift and do longs in | 235 | #define ERR_PACK(l,f,r) (((((unsigned long)l)&0xffL)<<24L)| \ |
| 236 | * the pre-processor :-( */ | 236 | ((((unsigned long)f)&0xfffL)<<12L)| \ |
| 237 | #define ERR_PACK(l,f,r) (((((unsigned long)l)&0xffL)*0x1000000)| \ | ||
| 238 | ((((unsigned long)f)&0xfffL)*0x1000)| \ | ||
| 239 | ((((unsigned long)r)&0xfffL))) | 237 | ((((unsigned long)r)&0xfffL))) |
| 240 | #define ERR_GET_LIB(l) (int)((((unsigned long)l)>>24L)&0xffL) | 238 | #define ERR_GET_LIB(l) (int)((((unsigned long)l)>>24L)&0xffL) |
| 241 | #define ERR_GET_FUNC(l) (int)((((unsigned long)l)>>12L)&0xfffL) | 239 | #define ERR_GET_FUNC(l) (int)((((unsigned long)l)>>12L)&0xfffL) |
diff --git a/src/lib/libssl/src/crypto/err/err.h b/src/lib/libssl/src/crypto/err/err.h index 9eb1158e75..fc2f1a4eaf 100644 --- a/src/lib/libssl/src/crypto/err/err.h +++ b/src/lib/libssl/src/crypto/err/err.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: err.h,v 1.18 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: err.h,v 1.19 2014/07/08 11:11:57 jsing 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 | * |
| @@ -232,10 +232,8 @@ typedef struct err_state_st { | |||
| 232 | #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__) |
| 233 | #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__) |
| 234 | 234 | ||
| 235 | /* Borland C seems too stupid to be able to shift and do longs in | 235 | #define ERR_PACK(l,f,r) (((((unsigned long)l)&0xffL)<<24L)| \ |
| 236 | * the pre-processor :-( */ | 236 | ((((unsigned long)f)&0xfffL)<<12L)| \ |
| 237 | #define ERR_PACK(l,f,r) (((((unsigned long)l)&0xffL)*0x1000000)| \ | ||
| 238 | ((((unsigned long)f)&0xfffL)*0x1000)| \ | ||
| 239 | ((((unsigned long)r)&0xfffL))) | 237 | ((((unsigned long)r)&0xfffL))) |
| 240 | #define ERR_GET_LIB(l) (int)((((unsigned long)l)>>24L)&0xffL) | 238 | #define ERR_GET_LIB(l) (int)((((unsigned long)l)>>24L)&0xffL) |
| 241 | #define ERR_GET_FUNC(l) (int)((((unsigned long)l)>>12L)&0xfffL) | 239 | #define ERR_GET_FUNC(l) (int)((((unsigned long)l)>>12L)&0xfffL) |