diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-11-21 21:29:44 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-11-21 21:29:44 +0000 |
| commit | 47a9d527aba6704cf57b9d0d18781cd55f2fc3be (patch) | |
| tree | d24c81f5921d464dba644ff371cad27568c4d639 /crypto/dh | |
| parent | d9907c972b8394f13388289284db13e5bb38ca54 (diff) | |
Update from 0.9.8 stable. Eliminate duplicate error codes.
Diffstat (limited to 'crypto/dh')
| -rw-r--r-- | crypto/dh/dh.h | 2 | ||||
| -rw-r--r-- | crypto/dh/dh_err.c | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/crypto/dh/dh.h b/crypto/dh/dh.h index 86499b4c7e..b0332f2c0c 100644 --- a/crypto/dh/dh.h +++ b/crypto/dh/dh.h @@ -227,7 +227,6 @@ void ERR_load_DH_strings(void); /* Function codes. */ #define DH_F_COMPUTE_KEY 102 -#define DH_F_DO_DH_PRINT 100 #define DH_F_DHPARAMS_PRINT_FP 101 #define DH_F_DH_BUILTIN_GENPARAMS 106 #define DH_F_DH_NEW_METHOD 105 @@ -236,6 +235,7 @@ void ERR_load_DH_strings(void); #define DH_F_DH_PRIV_ENCODE 111 #define DH_F_DH_PUB_DECODE 108 #define DH_F_DH_PUB_ENCODE 109 +#define DH_F_DO_DH_PRINT 100 #define DH_F_GENERATE_KEY 103 #define DH_F_GENERATE_PARAMETERS 104 #define DH_F_PKEY_DH_DERIVE 112 diff --git a/crypto/dh/dh_err.c b/crypto/dh/dh_err.c index ea5aeedd93..d5cf0c22a3 100644 --- a/crypto/dh/dh_err.c +++ b/crypto/dh/dh_err.c @@ -1,6 +1,6 @@ /* crypto/dh/dh_err.c */ /* ==================================================================== - * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -106,15 +106,12 @@ static ERR_STRING_DATA DH_str_reasons[]= void ERR_load_DH_strings(void) { - static int init=1; +#ifndef OPENSSL_NO_ERR - if (init) + if (ERR_func_error_string(DH_str_functs[0].error) == NULL) { - init=0; -#ifndef OPENSSL_NO_ERR ERR_load_strings(0,DH_str_functs); ERR_load_strings(0,DH_str_reasons); -#endif - } +#endif } |