Make compatible with nginx 1.12.0
This commit is contained in:
parent
fb6735ff12
commit
2940513cf6
|
@ -7,24 +7,8 @@
|
||||||
#include <ngx_config.h>
|
#include <ngx_config.h>
|
||||||
#include <ngx_core.h>
|
#include <ngx_core.h>
|
||||||
#include <ngx_http.h>
|
#include <ngx_http.h>
|
||||||
|
#include <ngx_md5.h>
|
||||||
#if (NGX_HAVE_OPENSSL_MD5_H)
|
#include <ngx_sha1.h>
|
||||||
#include <openssl/md5.h>
|
|
||||||
#else
|
|
||||||
#include <md5.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if (NGX_OPENSSL_MD5)
|
|
||||||
#define MD5Init MD5_Init
|
|
||||||
#define MD5Update MD5_Update
|
|
||||||
#define MD5Final MD5_Final
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if (NGX_HAVE_OPENSSL_SHA1_H)
|
|
||||||
#include <openssl/sha.h>
|
|
||||||
#else
|
|
||||||
#include <sha.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define NGX_ACCESSKEY_MD5 1
|
#define NGX_ACCESSKEY_MD5 1
|
||||||
#define NGX_ACCESSKEY_SHA1 2
|
#define NGX_ACCESSKEY_SHA1 2
|
||||||
|
@ -185,19 +169,19 @@ ngx_http_accesskey_handler(ngx_http_request_t *r)
|
||||||
|
|
||||||
u_char hashb[64], hasht[128];
|
u_char hashb[64], hasht[128];
|
||||||
|
|
||||||
MD5_CTX md5;
|
ngx_md5_t md5;
|
||||||
SHA_CTX sha;
|
ngx_sha1_t sha;
|
||||||
|
|
||||||
switch(alcf->hashmethod) {
|
switch(alcf->hashmethod) {
|
||||||
case NGX_ACCESSKEY_MD5:
|
case NGX_ACCESSKEY_MD5:
|
||||||
MD5Init(&md5);
|
ngx_md5_init(&md5);
|
||||||
MD5Update(&md5,val.data,val.len);
|
ngx_md5_update(&md5,val.data,val.len);
|
||||||
MD5Final(hashb, &md5);
|
ngx_md5_final(hashb, &md5);
|
||||||
break;
|
break;
|
||||||
case NGX_ACCESSKEY_SHA1:
|
case NGX_ACCESSKEY_SHA1:
|
||||||
SHA1_Init(&sha);
|
ngx_sha1_init(&sha);
|
||||||
SHA1_Update(&sha,val.data,val.len);
|
ngx_sha1_update(&sha,val.data,val.len);
|
||||||
SHA1_Final(hashb,&sha);
|
ngx_sha1_final(hashb,&sha);
|
||||||
break;
|
break;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue