diff options
| author | cloder <> | 2003-10-01 05:52:45 +0000 |
|---|---|---|
| committer | cloder <> | 2003-10-01 05:52:45 +0000 |
| commit | e72c8f7435abb9076ecc9b579949a470328d2bf8 (patch) | |
| tree | 5ff2f1b78c2c58f6845b0795d1717aa581502588 | |
| parent | b8dda8f19c80fc9ca652b971559629a06b9a17eb (diff) | |
| download | openbsd-e72c8f7435abb9076ecc9b579949a470328d2bf8.tar.gz openbsd-e72c8f7435abb9076ecc9b579949a470328d2bf8.tar.bz2 openbsd-e72c8f7435abb9076ecc9b579949a470328d2bf8.zip | |
Correct some off-by-ones. They currently don't matter, but this
is for future safety and consistency.
OK krw@, markus@
| -rw-r--r-- | src/lib/libssl/src/ssl/ssl_ciph.c | 6 | ||||
| -rw-r--r-- | src/lib/libssl/ssl_ciph.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c index 438d9eacbb..532fb4e80d 100644 --- a/src/lib/libssl/src/ssl/ssl_ciph.c +++ b/src/lib/libssl/src/ssl/ssl_ciph.c | |||
| @@ -73,7 +73,7 @@ | |||
| 73 | #define SSL_ENC_NUM_IDX 9 | 73 | #define SSL_ENC_NUM_IDX 9 |
| 74 | 74 | ||
| 75 | static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX]={ | 75 | static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX]={ |
| 76 | NULL,NULL,NULL,NULL,NULL,NULL, | 76 | NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL |
| 77 | }; | 77 | }; |
| 78 | 78 | ||
| 79 | static STACK_OF(SSL_COMP) *ssl_comp_methods=NULL; | 79 | static STACK_OF(SSL_COMP) *ssl_comp_methods=NULL; |
| @@ -251,7 +251,7 @@ int ssl_cipher_get_evp(SSL_SESSION *s, const EVP_CIPHER **enc, | |||
| 251 | break; | 251 | break; |
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | if ((i < 0) || (i > SSL_ENC_NUM_IDX)) | 254 | if ((i < 0) || (i >= SSL_ENC_NUM_IDX)) |
| 255 | *enc=NULL; | 255 | *enc=NULL; |
| 256 | else | 256 | else |
| 257 | { | 257 | { |
| @@ -273,7 +273,7 @@ int ssl_cipher_get_evp(SSL_SESSION *s, const EVP_CIPHER **enc, | |||
| 273 | i= -1; | 273 | i= -1; |
| 274 | break; | 274 | break; |
| 275 | } | 275 | } |
| 276 | if ((i < 0) || (i > SSL_MD_NUM_IDX)) | 276 | if ((i < 0) || (i >= SSL_MD_NUM_IDX)) |
| 277 | *md=NULL; | 277 | *md=NULL; |
| 278 | else | 278 | else |
| 279 | *md=ssl_digest_methods[i]; | 279 | *md=ssl_digest_methods[i]; |
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c index 438d9eacbb..532fb4e80d 100644 --- a/src/lib/libssl/ssl_ciph.c +++ b/src/lib/libssl/ssl_ciph.c | |||
| @@ -73,7 +73,7 @@ | |||
| 73 | #define SSL_ENC_NUM_IDX 9 | 73 | #define SSL_ENC_NUM_IDX 9 |
| 74 | 74 | ||
| 75 | static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX]={ | 75 | static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX]={ |
| 76 | NULL,NULL,NULL,NULL,NULL,NULL, | 76 | NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL |
| 77 | }; | 77 | }; |
| 78 | 78 | ||
| 79 | static STACK_OF(SSL_COMP) *ssl_comp_methods=NULL; | 79 | static STACK_OF(SSL_COMP) *ssl_comp_methods=NULL; |
| @@ -251,7 +251,7 @@ int ssl_cipher_get_evp(SSL_SESSION *s, const EVP_CIPHER **enc, | |||
| 251 | break; | 251 | break; |
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | if ((i < 0) || (i > SSL_ENC_NUM_IDX)) | 254 | if ((i < 0) || (i >= SSL_ENC_NUM_IDX)) |
| 255 | *enc=NULL; | 255 | *enc=NULL; |
| 256 | else | 256 | else |
| 257 | { | 257 | { |
| @@ -273,7 +273,7 @@ int ssl_cipher_get_evp(SSL_SESSION *s, const EVP_CIPHER **enc, | |||
| 273 | i= -1; | 273 | i= -1; |
| 274 | break; | 274 | break; |
| 275 | } | 275 | } |
| 276 | if ((i < 0) || (i > SSL_MD_NUM_IDX)) | 276 | if ((i < 0) || (i >= SSL_MD_NUM_IDX)) |
| 277 | *md=NULL; | 277 | *md=NULL; |
| 278 | else | 278 | else |
| 279 | *md=ssl_digest_methods[i]; | 279 | *md=ssl_digest_methods[i]; |