diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2006-11-21 22:29:44 +0100 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2006-11-21 22:29:44 +0100 |
commit | 47a9d527aba6704cf57b9d0d18781cd55f2fc3be (patch) | |
tree | d24c81f5921d464dba644ff371cad27568c4d639 /crypto/evp | |
parent | wording (can't really call shared libs experimental after several years in th... (diff) | |
download | openssl-47a9d527aba6704cf57b9d0d18781cd55f2fc3be.tar.xz openssl-47a9d527aba6704cf57b9d0d18781cd55f2fc3be.zip |
Update from 0.9.8 stable. Eliminate duplicate error codes.
Diffstat (limited to 'crypto/evp')
-rw-r--r-- | crypto/evp/evp_err.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c index 4ead16cba6..a93056828e 100644 --- a/crypto/evp/evp_err.c +++ b/crypto/evp/evp_err.c @@ -1,6 +1,6 @@ /* crypto/evp/evp_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 @@ -200,15 +200,12 @@ static ERR_STRING_DATA EVP_str_reasons[]= void ERR_load_EVP_strings(void) { - static int init=1; +#ifndef OPENSSL_NO_ERR - if (init) + if (ERR_func_error_string(EVP_str_functs[0].error) == NULL) { - init=0; -#ifndef OPENSSL_NO_ERR ERR_load_strings(0,EVP_str_functs); ERR_load_strings(0,EVP_str_reasons); -#endif - } +#endif } |