diff options
author | jsing <> | 2015-09-11 17:37:47 +0000 |
---|---|---|
committer | jsing <> | 2015-09-11 17:37:47 +0000 |
commit | 795a0361120faed435ab380a065eb0e8f4be991f (patch) | |
tree | ba0b04860bd55716e951c255038297a92a40438d /src | |
parent | 9b51e55410a98992b790990696f43eb1564f4f30 (diff) | |
download | openbsd-795a0361120faed435ab380a065eb0e8f4be991f.tar.gz openbsd-795a0361120faed435ab380a065eb0e8f4be991f.tar.bz2 openbsd-795a0361120faed435ab380a065eb0e8f4be991f.zip |
Nuke ssl_set_peer_cert_type().
ok "flensing knife"
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/src/ssl/ssl_cert.c | 9 | ||||
-rw-r--r-- | src/lib/libssl/src/ssl/ssl_locl.h | 3 | ||||
-rw-r--r-- | src/lib/libssl/ssl_cert.c | 9 | ||||
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 3 |
4 files changed, 4 insertions, 20 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_cert.c b/src/lib/libssl/src/ssl/ssl_cert.c index bc864883c8..cdac7bdb36 100644 --- a/src/lib/libssl/src/ssl/ssl_cert.c +++ b/src/lib/libssl/src/ssl/ssl_cert.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_cert.c,v 1.50 2015/04/06 04:09:59 guenther Exp $ */ | 1 | /* $OpenBSD: ssl_cert.c,v 1.51 2015/09/11 17:37:47 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -412,13 +412,6 @@ ssl_sess_cert_free(SESS_CERT *sc) | |||
412 | } | 412 | } |
413 | 413 | ||
414 | int | 414 | int |
415 | ssl_set_peer_cert_type(SESS_CERT *sc, int type) | ||
416 | { | ||
417 | sc->peer_cert_type = type; | ||
418 | return (1); | ||
419 | } | ||
420 | |||
421 | int | ||
422 | ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk) | 415 | ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk) |
423 | { | 416 | { |
424 | X509_STORE_CTX ctx; | 417 | X509_STORE_CTX ctx; |
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h index 7249cabea5..976bd27618 100644 --- a/src/lib/libssl/src/ssl/ssl_locl.h +++ b/src/lib/libssl/src/ssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.117 2015/09/11 17:35:36 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.118 2015/09/11 17:37:47 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -559,7 +559,6 @@ int ssl_cert_inst(CERT **o); | |||
559 | void ssl_cert_free(CERT *c); | 559 | void ssl_cert_free(CERT *c); |
560 | SESS_CERT *ssl_sess_cert_new(void); | 560 | SESS_CERT *ssl_sess_cert_new(void); |
561 | void ssl_sess_cert_free(SESS_CERT *sc); | 561 | void ssl_sess_cert_free(SESS_CERT *sc); |
562 | int ssl_set_peer_cert_type(SESS_CERT *c, int type); | ||
563 | int ssl_get_new_session(SSL *s, int session); | 562 | int ssl_get_new_session(SSL *s, int session); |
564 | int ssl_get_prev_session(SSL *s, unsigned char *session, int len, | 563 | int ssl_get_prev_session(SSL *s, unsigned char *session, int len, |
565 | const unsigned char *limit); | 564 | const unsigned char *limit); |
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c index bc864883c8..cdac7bdb36 100644 --- a/src/lib/libssl/ssl_cert.c +++ b/src/lib/libssl/ssl_cert.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_cert.c,v 1.50 2015/04/06 04:09:59 guenther Exp $ */ | 1 | /* $OpenBSD: ssl_cert.c,v 1.51 2015/09/11 17:37:47 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -412,13 +412,6 @@ ssl_sess_cert_free(SESS_CERT *sc) | |||
412 | } | 412 | } |
413 | 413 | ||
414 | int | 414 | int |
415 | ssl_set_peer_cert_type(SESS_CERT *sc, int type) | ||
416 | { | ||
417 | sc->peer_cert_type = type; | ||
418 | return (1); | ||
419 | } | ||
420 | |||
421 | int | ||
422 | ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk) | 415 | ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk) |
423 | { | 416 | { |
424 | X509_STORE_CTX ctx; | 417 | X509_STORE_CTX ctx; |
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 7249cabea5..976bd27618 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.117 2015/09/11 17:35:36 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.118 2015/09/11 17:37:47 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -559,7 +559,6 @@ int ssl_cert_inst(CERT **o); | |||
559 | void ssl_cert_free(CERT *c); | 559 | void ssl_cert_free(CERT *c); |
560 | SESS_CERT *ssl_sess_cert_new(void); | 560 | SESS_CERT *ssl_sess_cert_new(void); |
561 | void ssl_sess_cert_free(SESS_CERT *sc); | 561 | void ssl_sess_cert_free(SESS_CERT *sc); |
562 | int ssl_set_peer_cert_type(SESS_CERT *c, int type); | ||
563 | int ssl_get_new_session(SSL *s, int session); | 562 | int ssl_get_new_session(SSL *s, int session); |
564 | int ssl_get_prev_session(SSL *s, unsigned char *session, int len, | 563 | int ssl_get_prev_session(SSL *s, unsigned char *session, int len, |
565 | const unsigned char *limit); | 564 | const unsigned char *limit); |