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/ocsp/ocsp.h | 2 +- crypto/ocsp/ocsp_err.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'crypto/ocsp') diff --git a/crypto/ocsp/ocsp.h b/crypto/ocsp/ocsp.h index 5eee6071fe..8c18c57fd5 100644 --- a/crypto/ocsp/ocsp.h +++ b/crypto/ocsp/ocsp.h @@ -574,13 +574,13 @@ void ERR_load_OCSP_strings(void); #define OCSP_F_OCSP_CHECK_ISSUER 108 #define OCSP_F_OCSP_CHECK_VALIDITY 115 #define OCSP_F_OCSP_MATCH_ISSUERID 109 -#define OCSP_F_PARSE_HTTP_LINE1 118 #define OCSP_F_OCSP_PARSE_URL 114 #define OCSP_F_OCSP_REQUEST_SIGN 110 #define OCSP_F_OCSP_REQUEST_VERIFY 116 #define OCSP_F_OCSP_RESPONSE_GET1_BASIC 111 #define OCSP_F_OCSP_SENDREQ_BIO 112 #define OCSP_F_OCSP_SENDREQ_NBIO 117 +#define OCSP_F_PARSE_HTTP_LINE1 118 #define OCSP_F_REQUEST_VERIFY 113 /* Reason codes. */ diff --git a/crypto/ocsp/ocsp_err.c b/crypto/ocsp/ocsp_err.c index df93e45403..0cedcea682 100644 --- a/crypto/ocsp/ocsp_err.c +++ b/crypto/ocsp/ocsp_err.c @@ -1,6 +1,6 @@ /* crypto/ocsp/ocsp_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 @@ -131,15 +131,12 @@ static ERR_STRING_DATA OCSP_str_reasons[]= void ERR_load_OCSP_strings(void) { - static int init=1; +#ifndef OPENSSL_NO_ERR - if (init) + if (ERR_func_error_string(OCSP_str_functs[0].error) == NULL) { - init=0; -#ifndef OPENSSL_NO_ERR ERR_load_strings(0,OCSP_str_functs); ERR_load_strings(0,OCSP_str_reasons); -#endif - } +#endif } -- cgit v1.2.3