From 47a9d527aba6704cf57b9d0d18781cd55f2fc3be Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Tue, 21 Nov 2006 21:29:44 +0000 Subject: Update from 0.9.8 stable. Eliminate duplicate error codes. --- crypto/pkcs12/pk12err.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'crypto/pkcs12') diff --git a/crypto/pkcs12/pk12err.c b/crypto/pkcs12/pk12err.c index 5c92cb08e0..f6ddf2df12 100644 --- a/crypto/pkcs12/pk12err.c +++ b/crypto/pkcs12/pk12err.c @@ -1,6 +1,6 @@ /* crypto/pkcs12/pk12err.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 @@ -133,15 +133,12 @@ static ERR_STRING_DATA PKCS12_str_reasons[]= void ERR_load_PKCS12_strings(void) { - static int init=1; +#ifndef OPENSSL_NO_ERR - if (init) + if (ERR_func_error_string(PKCS12_str_functs[0].error) == NULL) { - init=0; -#ifndef OPENSSL_NO_ERR ERR_load_strings(0,PKCS12_str_functs); ERR_load_strings(0,PKCS12_str_reasons); -#endif - } +#endif } -- cgit v1.2.3